aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/217] Silence errors in tests, not code.Oleg Pudeyev2011-06-061-1/+1
| | | | | | Use a mock user object for testing bbcode. PHPBB3-217
* [ticket/217] Use positive parameter statement for bbcode_init()rxu2011-06-061-2/+2
| | | | PHPBB3-217
* [ticket/217] Adjust patch, add testsrxu2011-06-061-3/+8
| | | | PHPBB3-217
* [ticket/217] Multiline [url] not convertedrxu2011-06-061-1/+3
| | | | | | This is the second attempt parse multiline URL text, see the ticket comments. PHPBB3-217
* Merge remote-tracking branch 'naderman/ticket/10149' into develop-olympusAndreas Fischer2011-06-031-1/+6
|\ | | | | | | | | * naderman/ticket/10149: [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
| * [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalarNils Adermann2011-06-031-1/+6
| | | | | | | | PHPBB3-10149
* | Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympusAndreas Fischer2011-06-031-2/+2
|\ \ | | | | | | | | | | | | * naderman/ticket/9950: [ticket/9950] Use actual language instead of user's language in overall header
| * | [ticket/9950] Use actual language instead of user's language in overall headerNils Adermann2011-06-021-2/+2
| |/ | | | | | | PHPBB3-9950
* | Merge remote-tracking branch 'naderman/ticket/9685' into develop-olympusAndreas Fischer2011-06-022-2/+2
|\ \ | |/ |/| | | | | | | * naderman/ticket/9685: [ticket/9685] Test for databases that are able to nest transactions [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
| * [ticket/9685] Consistently name the new sql_buffer_nested_transactions functionNils Adermann2011-06-022-2/+2
| | | | | | | | PHPBB3-9685
* | Merge branch 'ticket/p/10039' into develop-olympusNils Adermann2011-06-021-0/+3
|\ \ | |/ |/| | | | | * ticket/p/10039: [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
| * [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.Patrick Webster2011-05-131-0/+3
| | | | | | | | PHPBB3-10039
* | Merge remote-tracking branch 'erikfrerejean/ticket/10192' into develop-olympusAndreas Fischer2011-05-231-1/+1
|\ \ | | | | | | | | | | | | * erikfrerejean/ticket/10192: [ticket/10192] Add missing semicolon
| * | [ticket/10192] Add missing semicolonErik Frèrejean2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | if the index has to be recreated it will run into the private message table query. PHPBB3-10192
* | | Merge remote-tracking branch 'p/ticket/9630' into develop-olympusAndreas Fischer2011-05-234-6/+5
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/9630: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| * | | [ticket/9630] Make language for moving posts clearer in quickmod/mcp.Oleg Pudeyev2011-05-024-6/+5
| | | | | | | | | | | | | | | | PHPBB3-9630
* | | | 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
* | | | [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
* | | | [ticket/10186] UCP signature panel displays when not authed for signaturesRMcGirr832011-05-121-0/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | The signature panel link was displayed even when a user did not have the auths to create/edit their signature. Clicking on the link gave a trigger_error of "Not authorised to have a signature". Hide the link when user does not have permissions to edit their signature. PHPBB3-10186
* | | Merge remote-tracking branch 'bantu/ticket/10126' into develop-olympusOleg Pudeyev2011-05-105-5/+5
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/10126: [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
| * | | [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.Andreas Fischer2011-05-115-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Make what we want to achieve clear by using "and not" instead of "xor". PHPBB3-10126
* | | | Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympusOleg Pudeyev2011-05-102-7/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * 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] Include www in hostname in language strings.Andreas Fischer2011-05-111-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10170
| * | | [ticket/10170] Update language entriesErik Frèrejean2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the language entries to reflect the reCaptcha API change. 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 remote-tracking branch 'bantu/ticket/10154' into develop-olympusOleg Pudeyev2011-05-091-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10154: [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
| * | | | [ticket/10154] Move "copy permissions from" to below "parent" on forum creationAndreas Fischer2011-05-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move "copy permissions from" to below "parent forum" in forum creation form. PHPBB3-10154
* | | | | [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.Andreas Fischer2011-05-092-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9999
* | | | | [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 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 remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympusOleg Pudeyev2011-05-031-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * erikfrerejean/ticket/9954: [ticket/9954] Remove unneeded never permission
| * | | | [ticket/9954] Remove unneeded never permissionErik Frèrejean2010-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ROLE_USER_NOAVATAR` role gets a *never* permission assigned for the two "u_masspm*" permissions. Due to this, this role changes behaviour it isn't intended to change. It should assign "no" as is done in the `ROLE_USER_LIMITED` role. PHPBB3-9954
* | | | | 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 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 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 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/p/10147: [ticket/10147] Corrected a typo in includes/functions_template.php.