aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-161-0/+21
|\ | | | | | | | | | | | | * develop-olympus: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). [ticket/10243] Call phpbb_gmgetdate() from various places. [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
| * Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympusNils Adermann2011-07-161-0/+21
| |\ | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10243: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). [ticket/10243] Call phpbb_gmgetdate() from various places. [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
| | * [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.Andreas Fischer2011-07-121-0/+21
| | | | | | | | | | | | PHPBB3-10243
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-24/+58
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions Conflicts: phpBB/includes/functions_display.php
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into ↵Nils Adermann2011-07-161-23/+57
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10237: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
| | * | [ticket/10237] Also display login-box on subscribingJoas Schilling2011-07-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10237
| | * | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-111-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | Also add some information to the confirm-box (forum_name / topic title) PHPBB3-10237
| | * | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-071-9/+21
| | | | | | | | | | | | | | | | PHPBB3-10237
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-166-22/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/5506] Do not display an empty last page after deleting logs.
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into ↵Nils Adermann2011-07-166-22/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/5506: [ticket/5506] Do not display an empty last page after deleting logs.
| | * | | [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-146-22/+39
| | | |/ | | |/| | | | | | | | | | | | | | | | | The fix is copied from view_inactive_users(). Also add keywords and sort parameters to url for deleting logs and inactive users. And finally save some queries if there are no logs/users to display anyway
* | | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
| * | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
| |/ / | | | | | | | | | PHPBB3-10267
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-072-1/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 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
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-072-1/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * \ Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9Andreas Fischer2011-07-072-1/+37
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | [ticket/10250] The site_logo hash is different depending on imageset & languageNils Adermann2011-07-061-4/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-10250
| | | * | [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imagesetNils Adermann2011-07-051-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10250
| | | * | [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is usedNils Adermann2011-07-051-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-062-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-07-062-2/+2
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | * 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
| | * | [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-062-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9859
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-051-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| | * | Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9Andreas Fischer2011-07-051-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10247: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| | | * | [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)Nils Adermann2011-07-041-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | attempt_id column was deleted PHPBB3-10247
| | * | [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.Andreas Fischer2011-07-051-1/+1
| | |/
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-261-1/+1
| | |
* | | 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
| | * [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.
| | * [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 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"
| | * [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-191-3/+6
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [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-161-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-161-1/+1
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| | * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-161-1/+1
| | | | | | | | | | | | PHPBB3-10221
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.Andreas Fischer2011-06-151-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-0/+122
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-0/+122
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php
| | * Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9Andreas Fischer2011-06-151-0/+122
| | |\ | | | | | | | | | | | | | | | | | | | | * Marshalrusty/ticket/10218: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php
| | | * [ticket/10218] Prevent startime from being overwritten by deregister_globals()Yuriy Rusko2011-06-151-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10218
| | | * [ticket/10218] Moving global deregistration, etc. to startup.phpYuriy Rusko2011-06-141-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because startup.php deletes all variables, the constants in database_update are used to preserve settings at the top. PHPBB3-10218
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10220] Limit user agent value length for storage in login attempt table
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10220] Limit user agent value length for storage in login attempt table
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 01:37:35 +0000