aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-260-0/+0
|\ | | | | | | | | * develop-olympus: [prep-release-3.0.9] Bump database version to RC3 too.
| * Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-260-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Bump database version to RC3 too. Conflicts: phpBB/install/database_update.php
| | * [prep-release-3.0.9] Bump database version to RC3 too.Andreas Fischer2011-06-261-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-262-4/+28
|\ \ \ | |/ / | | | | | | | | | | | | * 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.
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-262-4/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.Andreas Fischer2011-06-261-1/+25
| | |
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-264-5/+11
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10233] IE Emulation fix breaks PM posting layout
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-1/+1
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/10233] IE Emulation fix breaks PM posting layout
| | * Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9Andreas Fischer2011-06-261-1/+1
| | |\ | | | | | | | | | | | | | | | | * naderman/ticket/10233: [ticket/10233] IE Emulation fix breaks PM posting layout
| | | * [ticket/10233] IE Emulation fix breaks PM posting layoutRaimon2011-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-16/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10188] Prevent semi-compressed output
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-16/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10188] Prevent semi-compressed output
| | * | Merge remote-tracking branch 'naderman/ticket/10188' into prep-release-3.0.9Andreas Fischer2011-06-261-16/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10188: [ticket/10188] Prevent semi-compressed output
| | | * | [ticket/10188] Prevent semi-compressed outputNils Adermann2011-06-261-16/+15
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-261-0/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-261-0/+28
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
| | * | Merge branch 'ticket/bantu/7729' into prep-release-3.0.9Nils Adermann2011-06-261-0/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/7729: [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
| | | * | [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.Andreas Fischer2011-06-251-0/+28
| | |/ / | | | | | | | | | | | | PHPBB3-7729
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-221-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
| | * | Merge remote-tracking branch 'naderman/ticket/10228' into prep-release-3.0.9Andreas Fischer2011-06-221-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10228: [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
| | | * | [ticket/10228] Correct "trigger" to "triggered" in acp registration settingsNils Adermann2011-06-221-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-10228
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-201-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-201-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
| | * | Merge branch 'ticket/bantu/10234' into prep-release-3.0.9Nils Adermann2011-06-201-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10234: [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
| | | * | [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"Andreas Fischer2011-06-201-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10234
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-201-11/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10223] Make definition of phpbb_require_updated conditional
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-201-11/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10223] Make definition of phpbb_require_updated conditional
| | * | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-201-11/+14
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | * naderman/ticket/10223: [ticket/10223] Make definition of phpbb_require_updated conditional
| | | * | [ticket/10223] Make definition of phpbb_require_updated conditionalNils Adermann2011-06-201-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The automatic updater defines it too and includes database_update.php for updating which causes an error otherwise. PHPBB3-10223
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-192-26/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10223] Replace spaces with tabs
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-192-26/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10223] Replace spaces with tabs
| | * | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-192-26/+26
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * naderman/ticket/10223: [ticket/10223] Replace spaces with tabs
| | | * | [ticket/10223] Replace spaces with tabsNils Adermann2011-06-192-26/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-10223
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-191-3/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
| * | | | Merge remote-tracking branch 'rxu/ticket/10227' into develop-olympusAndreas Fischer2011-06-191-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10227: [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
| | * | | | [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+rxu2011-06-191-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10227
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-195-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
| * | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-195-5/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
| | * | | | Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9Andreas Fischer2011-06-195-5/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10232: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
| | | * | | | [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDSNils Adermann2011-06-185-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids the global hidden fields from functions.php overwriting local searches. PHPBB3-10232
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-193-11/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-193-11/+39
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | * prep-release-3.0.9: [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.
| | * | | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-193-11/+39
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * | | [ticket/10223] The search fid parameter is an array of forums not just an idNils Adermann2011-06-191-1/+1
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-10223
| | | * | [ticket/10223] Check optional before file_exists and correct require pathNils Adermann2011-06-182-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10223
| | | * | [ticket/10223] requiring the new startup.php file conditionally.Nils Adermann2011-06-182-10/+38
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Added a function for this which we can potentially apply to more of the files in the installer and database updater. PHPBB3-10223
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-181-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10229] On languge/acp/styles.php "%s" should be %s
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-181-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10229] On languge/acp/styles.php "%s" should be %s