1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 20:45:16 +02:00
Commit Graph

10430 Commits

Author SHA1 Message Date
e6572b766f [prep-release-3.0.9] Bumping version number for 3.0.9 final. 2011-07-10 22:36:17 +02:00
1fa77c2fd5 [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. release-3.0.9-RC4 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
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
02bba23844 Merge branch 'ticket/marshalrusty/9859' into prep-release-3.0.9
* ticket/marshalrusty/9859:
  [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:50:43 -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
ca2d6a01f1 Merge remote-tracking branch 'nickvergessen/ticket/10247' into prep-release-3.0.9
* nickvergessen/ticket/10247:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
2011-07-06 23:18:51 +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
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
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
f5d86d0604 Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9
* naderman/ticket/10247:
  [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
2011-07-05 00:27:04 +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
96eab49a7a [ticket/10247] Add a db_tools test for the removal of a primary key column.
The previous drop column test already deleted the primary key, so that one was
replaced with an ordinary column.

PHPBB3-10247
2011-07-03 18:09:56 -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. release-3.0.9-RC3 2011-06-26 21:50:02 +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
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
f249287dc9 Merge remote-tracking branch 'naderman/ticket/10188' into prep-release-3.0.9
* naderman/ticket/10188:
  [ticket/10188] Prevent semi-compressed output
2011-06-26 20:39:54 +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
fc5a68c2cf Merge branch 'ticket/bantu/7729' into prep-release-3.0.9
* ticket/bantu/7729:
  [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
2011-06-26 01:36:16 +02:00
9f3b159998 [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
PHPBB3-7729
2011-06-25 17:42:52 +02:00
1ffa586583 Merge remote-tracking branch 'naderman/ticket/10228' into prep-release-3.0.9
* naderman/ticket/10228:
  [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
2011-06-22 02:32:13 +02:00
237af043d6 [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
PHPBB3-10228
2011-06-22 02:27:37 +02:00
b7069f395b Merge branch 'ticket/bantu/10234' into prep-release-3.0.9
* ticket/bantu/10234:
  [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
2011-06-20 00:33:38 +02:00
d5c2bbf620 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
  [ticket/10223] Make definition of phpbb_require_updated conditional
2011-06-20 00:28:02 +02:00
8c01ed578d [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
PHPBB3-10234
2011-06-20 00:03:20 +02:00
ad5ed9d0ee [ticket/10223] Make definition of phpbb_require_updated conditional
The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
2011-06-20 00:00:30 +02:00
6a4ca8cad9 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
  [ticket/10223] Replace spaces with tabs
2011-06-19 23:11:57 +02:00
67fde80fbb [ticket/10223] Replace spaces with tabs
PHPBB3-10223
2011-06-19 23:02:59 +02:00
e2fe25fbdc Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9
* naderman/ticket/10232:
  [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
2011-06-19 17:57:56 +02:00
c4c22d4421 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
2011-06-19 17:56:30 +02:00
d37e8dd6d3 [ticket/10223] The search fid parameter is an array of forums not just an id
PHPBB3-10223
2011-06-19 00:13:33 +02:00
d3f1b60292 [ticket/10223] Check optional before file_exists and correct require path
PHPBB3-10223
2011-06-18 23:48:37 +02:00
6458a1a16a [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
Avoids the global hidden fields from functions.php overwriting local
searches.

PHPBB3-10232
2011-06-18 23:22:25 +02:00
882cb084d7 Merge remote-tracking branch 'Raimon/ticket/10229' into prep-release-3.0.9
* Raimon/ticket/10229:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
2011-06-18 15:11:59 +02:00
dd0606a317 [ticket/10229] On languge/acp/styles.php "%s" should be %s
PHPBB3-10229
2011-06-18 15:00:39 +02:00
1b0821a11b [ticket/10223] requiring the new startup.php file conditionally.
Added a function for this which we can potentially apply to more of the files in the
installer and database updater.

PHPBB3-10223
2011-06-18 01:02:58 +02:00
2bae5298e0 [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release. release-3.0.9-RC2 2011-06-16 16:16:55 +02:00
1d349ee5a8 Merge remote-tracking branch 'naderman/ticket/10221' into prep-release-3.0.9
* naderman/ticket/10221:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
2011-06-16 16:11:20 +02:00
63b9b91dee [ticket/10221] Append unit (seconds) after input field, remove from explanation
PHPBB3-10221
2011-06-16 16:02:34 +02:00