aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ | | | | | | | | * develop-olympus: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
| * Merge remote-tracking branch 'p/ticket/10191' into develop-olympusAndreas Fischer2011-05-231-1/+1
| |\ | | | | | | | | | | | | * p/ticket/10191: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
| | * [ticket/10191] Use ob_get_level in exit_handler for output buffering check.Oleg Pudeyev2011-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling flush() when output buffering is enabled causes output to be duplicated. Besides phpBB enabling output buffering for gzip compression, output buffering may be enabled externally to phpBB via output_handler or output_buffering directives in php.ini. Use ob_get_level to determine whether output buffering is active and call ob_flush in that case. PHPBB3-10191
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
| * | [ticket/10188] Use ob_get_level in msg_handler for output buffering check.Oleg Pudeyev2011-05-221-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Output buffering may be enabled via various approaches, among them: * output_buffering in php.ini; * output_handler in php.ini enables output_buffering; * ob_start call. ob_get_level allows us to query php runtime for the actual output buffering status. PHPBB3-10188
| * Merge remote-tracking branch 'bantu/ticket/10146' into develop-olympusOleg Pudeyev2011-05-131-1/+2
| |\ | | | | | | | | | | | | * bantu/ticket/10146: [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
| | * [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).Andreas Fischer2011-04-221-1/+2
| | | | | | | | | | | | PHPBB3-10146
* | | Merge remote-tracking branch 'p/ticket/10156' into developAndreas Fischer2011-05-231-2/+10
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/10156: [ticket/10156] Fix new cron on windows.
| * | | [ticket/10156] Fix new cron on windows.Oleg Pudeyev2011-05-191-2/+10
| | | | | | | | | | | | | | | | PHPBB3-10156
* | | | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-203-1/+50
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-203-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | | Merge remote-tracking branch 'bantu/ticket/10146-develop' into developOleg Pudeyev2011-05-131-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10146-develop: [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
| * | | | [ticket/10146] Fix Firebird DECIMAL precision issue on develop.Andreas Fischer2011-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10146
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-101-4/+9
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| * | | | Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympusOleg Pudeyev2011-05-101-4/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10170: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| | * | | | [ticket/10170] Fix broken recaptcha verification host.Andreas Fischer2011-05-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10170
| | * | | | [ticket/10170] reCaptcha API has been moved.Erik Frèrejean2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reCaptcha API has been moved from recaptcha.net to google.com/recaptcha. PHPBB3-10170
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-091-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | * develop-olympus: [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common. [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
| * | | | [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.Andreas Fischer2011-05-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | L_FORUM_FOLDER_ALT was supposed to be a language variable but the language variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead. Also, the expected functionality is correctly implemented by FORUM_FOLDER_IMG_ALT. PHPBB3-9999
* | | | | Merge remote-tracking branch 'p/ticket/9693' into developAndreas Fischer2011-05-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9693: [ticket/9693] Removed useless $auth globalizations.
| * | | | | [ticket/9693] Removed useless $auth globalizations.Oleg Pudeyev2011-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9693
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-05-051-4/+258
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools. [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools. [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools. [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools. [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools. [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
| * | | | | Merge branch 'ticket/p/10003' into develop-olympusNils Adermann2011-05-051-4/+258
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10003: [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools. [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools. [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools. [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools. [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools. [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
| | * | | | | [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.Oleg Pudeyev2011-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10003
| | * | | | | [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.Oleg Pudeyev2011-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of it was already in db_tools, these changes could have applied to code that did not exist in db_tools at the time of the commit. PHPBB3-10003
| | * | | | | [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.Oleg Pudeyev2011-04-291-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The diff in database_update was only partially relevant. PHPBB3-10003
| | * | | | | [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.Oleg Pudeyev2011-04-291-6/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was painful. Git wanted to patch hunks in wrong places. Hopefully I got it right. PHPBB3-10003
| | * | | | | [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.Oleg Pudeyev2011-04-291-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This diff applied cleanly. PHPBB3-10003
| | * | | | | [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.Oleg Pudeyev2011-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is somewhat questionable, maybe it should be reviewed. PHPBB3-10003
| | * | | | | [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.Oleg Pudeyev2011-04-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10003
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-301-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * develop-olympus: [ticket/9961] Create log entries when users are activated.
| * | | | | Merge branch 'erikfrerejean/ticket/9961' into develop-olympusOleg Pudeyev2011-04-301-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * erikfrerejean/ticket/9961: [ticket/9961] Create log entries when users are activated.
| | * | | | [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create log entries when a user activates own account without also changing their password. * Additionally create admin log entries when an administrator activates user accounts. PHPBB3-9961
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-04-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
| * | | | Merge remote branch 'bantu/ticket/10145' into develop-olympusIgor Wiedler2011-04-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10145: [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
| | * | | | [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.Andreas Fischer2011-04-261-1/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-10145
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-261-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/7941] Added @return to generate_board_url docstring.
| * | | | Merge remote branch 'p/ticket/7941' into develop-olympusAndreas Fischer2011-04-261-0/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * p/ticket/7941: [ticket/7941] Added @return to generate_board_url docstring.
| | * | | [ticket/7941] Added @return to generate_board_url docstring.Oleg Pudeyev2011-04-171-0/+3
| | |/ / | | | | | | | | | | | | PHPBB3-7941
* | | | Merge branch 'feature/rxu/attachment-management-no-reassignment' into developOleg Pudeyev2011-04-243-1/+231
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/rxu/attachment-management-no-reassignment: [feature/attachment-management-no-reassignment] Handle privacy and some more. [feature/attachment-management-no-reassignment] Further feature adjustments. [feature/attachment-management-no-reassignment] Fix some more errors [feature/attachment-management-no-reassignment] Fix minor flaws in the code. [feature/attachment-management-no-reassignment] Attachments management
| * | | | [feature/attachment-management-no-reassignment] Handle privacy and some more.rxu2011-04-242-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - restrict files info for PM attachments; - add an option to resync files stats if wrong; - replace post_id sorting with post type (PM/regular post) one; - some language fixes. PHPBB3-9721
| * | | | [feature/attachment-management-no-reassignment] Further feature adjustments.rxu2011-04-112-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -add database update entry; - add files statistics checks; - improve files deletion procedure; - improve reversed order for pagination; - adjust template file; - add missing comma for orphan key in info module; - change module mode name; - fix module explanation text; - add files comments output; - change attachments per page amount from posts to topics per page value. PHPBB3-9721
| * | | | [feature/attachment-management-no-reassignment] Fix some more errorsrxu2011-04-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing comma for orphan key in info module, define $start variable PHPBB3-9721
| * | | | [feature/attachment-management-no-reassignment] Fix minor flaws in the code.rxu2011-04-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Oleg for inspection. PHPBB3-9721
| * | | | [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-102-0/+155
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This feature allows to manage attachments in posts and PMs via ACP. PHPBB3-9721
* | | | [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.Oleg Pudeyev2011-04-241-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10148
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-231-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/10147] Corrected a typo in includes/functions_template.php.
| * | | Merge branch 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/10147: [ticket/10147] Corrected a typo in includes/functions_template.php.
| | * | | [ticket/10147] Corrected a typo in includes/functions_template.php.Oleg Pudeyev2011-04-231-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-10147
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-221-1/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10141] Save a hash lookup when value is not in cache. [ticket/10141] Split double-assignment into conditional and unconditional part. [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.