1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 12:35:55 +02:00
Commit Graph

10879 Commits

Author SHA1 Message Date
c945fc9355 [ticket/10155] Add jQuery, introduce global assets path
Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
2011-07-11 10:00:30 +02:00
09e0460e5b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/install/database_update.php
2011-07-10 23:11:29 +02:00
e4707a8be7 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-07-10 23:08:56 +02:00
e6572b766f [prep-release-3.0.9] Bumping version number for 3.0.9 final. 2011-07-10 22:36:17 +02:00
e2d27a30a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10003] Fixed comment referring to db_tools duplication.
  [ticket/10003] Require db_tools.php in database_update.php.
  [ticket/10003] Use phpbb_db_tools in database_update.php.
  [ticket/10003] Delete the copy of db_tools in database_update.php.

Conflicts:
	phpBB/install/database_update.php
2011-07-09 16:01:54 +02:00
00f7db66f2 [ticket/10003] Fixed comment referring to db_tools duplication.
PHPBB3-10003
2011-07-09 01:56:43 -04:00
fd728c2815 [ticket/10003] Require db_tools.php in database_update.php.
Use require_updated to use the new version of db_tools if one
is present.

PHPBB3-10003
2011-07-09 01:53:07 -04:00
5b5c227423 [ticket/10003] Use phpbb_db_tools in database_update.php.
Now that the copy of db tools has been deleted, change which
class name is used.

PHPBB3-10003
2011-07-09 01:53:07 -04:00
919ba8eb3f [ticket/10003] Delete the copy of db_tools in database_update.php.
PHPBB3-10003
2011-07-09 01:53:01 -04:00
9c6c5895bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.
2011-07-07 20:29:25 +02:00
f2110183e0 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-07-07 20:29:14 +02:00
1fa77c2fd5 [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. 2011-07-07 20:20:52 +02:00
787245a113 [prep-release-3.0.9] Decreasing version for an RC4 release. 2011-07-07 20:19:11 +02:00
79af1da0a5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
2011-07-07 20:06:26 +02:00
71df03960c Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
2011-07-07 20:06:11 +02:00
5fefdecc50 Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9
* naderman/ticket/10250:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
2011-07-07 20:05:47 +02:00
3fb9b62c69 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
2011-07-06 21:52:05 -04:00
cf4e6d8a3e Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
2011-07-06 21:51:33 -04:00
a275d17625 [ticket/9859] Changing all phpBB footers to match the new credit line
PHPBB3-9859
2011-07-06 21:46:33 -04:00
f22081d21e [ticket/9859] New footer copyright line with registered symbol
PHPBB3-9859
2011-07-06 19:36:25 -04:00
b261a1a31a [ticket/10250] The site_logo hash is different depending on imageset & language
PHPBB3-10250
2011-07-06 17:53:57 -04:00
7b2f88686b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
2011-07-06 23:20:41 +02:00
5eeb870442 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
2011-07-06 23:19:02 +02:00
8ec737e9c4 [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
PHPBB3-10250
2011-07-05 19:38:15 -04:00
f610f44a4e [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
The new logo is slightly wider than the old logo. If we changed the size in the
imageset.cfg we would cause a conflict for everyone who replaced the logo with
their own and modified the size. Instead we overwrite the width and height in
the img() function in session.php only if its contents are that of the stock
phpbb logo.

PHPBB3-10250
2011-07-05 19:09:09 -04:00
0c93e92eef [ticket/10247] Remove attempt_id as primary key from database_update.php
PHPBB3-10247
2011-07-05 23:19:39 +02:00
77c9422630 [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
PHPBB3-10250
2011-07-05 17:08:11 -04:00
0a79930387 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
2011-07-05 02:10:03 +02:00
7e4460dbc9 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
2011-07-05 02:09:47 +02:00
c916d49ddd Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9
* naderman/ticket/10247:
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
2011-07-05 02:09:29 +02:00
0d602e1722 [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
attempt_id column was deleted

PHPBB3-10247
2011-07-04 19:57:54 -04:00
5f73cdcdc2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column

Conflicts:
	phpBB/install/database_update.php
2011-07-05 01:07:22 +02:00
fa253b8b58 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-07-05 01:03:37 +02:00
7ca9c33157 [prep-release-3.0.9] Update Changelog for 3.0.9 release. 2011-07-05 00:43:09 +02:00
d8ac2cc5f0 [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. 2011-07-05 00:40:45 +02:00
cb7604dcd8 [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
To make sure that this column (which was too small and unecessary) does not
remain on 3.0.9-RCX installations and boards that were updated to a 3.0.9 RC,
the 3.0.10-RC1 release must correctly drop the column after db_tools has been
corrected and fully reviewed. The current version is not capable of dropping
primary keys correctly on all supported DBMSs.

PHPBB3-10247
2011-07-04 02:31:00 -04:00
984fd07319 [ticket/10247] Add empty data section to database update for RC4
PHPBB3-10247
2011-07-03 02:29:51 -04:00
cf4b639be5 [ticket/10247] Remove unecessary attempt_id primary key column
The database update drops any key of the same name (potential primary key) and
afterwards the column. This does not work on some of the supported DBMS and
needs further changes.

PHPBB3-10247
2011-07-03 02:15:40 -04:00
ffa6f3448f [prep-release-3.0.9] Bump database version to RC3 too. 2011-06-26 21:50:02 +02:00
372e885456 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.
2011-06-26 21:00:25 +02:00
44c8126323 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-06-26 21:00:08 +02:00
172e3c07d6 [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release. 2011-06-26 20:57:06 +02:00
fe0932fdf0 [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. 2011-06-26 20:47:33 +02:00
aba4007ae6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:42:06 +02:00
84ff04056a Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:41:59 +02:00
1ae42ae6ba Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9
* naderman/ticket/10233:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:40:59 +02:00
cabb42790c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10188] Prevent semi-compressed output
2011-06-26 20:40:42 +02:00
cdc23a9877 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10188] Prevent semi-compressed output
2011-06-26 20:40:25 +02:00
a5ef6c3b20 [ticket/10188] Prevent semi-compressed output
When a non-fatal error occurs at the beginning of the script before any custom
error handler is set one of two situations can be encountered:

1) if the ini option output buffer is disabled:
      - headers are sent to the http client
      - the error message is output
2) if the ini option output_buffer is enabled or the script
   is run within an ob_start()/ob_end() wrapper:
      - the error message is written to the output buffer

Once the script reaches page_header() phpbb starts gzip compression if enabled.
This is done through ob_start with a ob_gzhandler as a callback. The
compression is skipped if headers have already been sent. In situation 1) the
error message sent in plain text comes with headers and this gzip compression
is skipped. The client receives a plaintext version of the page. However in
situation 2) headers have not been sent yet and the rest of the page will be
compressed. The result is a plaintext error message followed by compressed
output. The client does not understand this output resulting in either an
error message or simply a blank page in the browser.

In addition to the above situation this problem occurs with errors that are
triggered after the custom error handler is loaded. The problem has been
noticed before, and a workaround was found. The error handler would call
ob_flush() for particular configuration settings before outputting the error
message. This resulted in headers being sent when output buffering was enabled
thus disabling gzip compression for the rest of the page. The constraints under
which ob_flush() was called were lessened over time whenever a new case was
found that would trigger this problem. Eventually ob_flush() would be called
even when code causing an E_NOTICE was simply run within an ob_start/ob_end.
This makes it impossible to use output buffering to retrieve the content of an
error message without prohibiting the page from setting headers afterwards.

This commit removes all flushing in msg_handler completely and instead fixes
the problem for both errors before and after the error handler is registered.
GZIP compression is only enabled if there is at most one level of output
buffering (e.g. the output_buffer php.ini option is enabled) and if there has
not yet been any output in this buffer. This should avoid any partial output
compression.

PHPBB3-10188
2011-06-26 20:31:22 +02:00
d59482366a [ticket/10233] IE Emulation fix breaks PM posting layout
The minimum and maximum width of 100% make the textarea dynamically
adjust. However the smilies next to the textarea will float out of
their containing div when the default width pre-min/max is specified
as a too high value.

PHPBB3-10233
2011-06-26 11:10:05 +02:00