aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-143-1/+5
| | | | PHPBB3-9956
* Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympusAndreas Fischer2011-09-271-2/+2
|\ | | | | | | | | * naderman/ticket/10394: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
| * [ticket/10394] Use call_user_func_array to pass a ref into a dynamic functionNils Adermann2011-09-271-2/+2
| | | | | | | | PHPBB3-10394
* | Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympusAndreas Fischer2011-09-271-5/+3
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/10315: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
| * | [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlappingJoas Schilling2011-09-211-5/+3
| | | | | | | | | | | | PHPBB3-10315
* | | Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympusAndreas Fischer2011-09-272-3/+3
|\ \ \ | | |/ | |/| | | | | | | * naderman/ticket/10394: [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
| * | [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4Nils Adermann2011-09-272-3/+3
|/ / | | | | | | PHPBB3-10394
* | Merge remote-tracking branch 'github-bantu/ticket/10370' into develop-olympusNils Adermann2011-09-191-37/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10370: [ticket/10370] Add function documentation for get_stacktrace(). [ticket/10370] Explain that we are not the ones hiding backtrace pieces. [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path(). [ticket/10370] Add require_once to whitelisted functions. [ticket/10370] Use single string instead of an array for arguments. [ticket/10370] Ease up code checking for arguments of include etc. [ticket/10370] Use unset() on the first backtrace instead of checking in loop. [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().
| * | [ticket/10370] Add function documentation for get_stacktrace().Andreas Fischer2011-09-191-1/+6
| | | | | | | | | | | | PHPBB3-10370
| * | [ticket/10370] Explain that we are not the ones hiding backtrace pieces.Andreas Fischer2011-09-191-2/+3
| | | | | | | | | | | | | | | | | | Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d. PHPBB3-10370
| * | [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().Andreas Fischer2011-09-191-2/+1
| | | | | | | | | | | | PHPBB3-10370
| * | [ticket/10370] Add require_once to whitelisted functions.Andreas Fischer2011-09-191-1/+1
| | | | | | | | | | | | PHPBB3-10370
| * | [ticket/10370] Use single string instead of an array for arguments.Andreas Fischer2011-09-191-3/+3
| | | | | | | | | | | | PHPBB3-10370
| * | [ticket/10370] Ease up code checking for arguments of include etc.Andreas Fischer2011-09-191-14/+7
| | | | | | | | | | | | PHPBB3-10370
| * | [ticket/10370] Use unset() on the first backtrace instead of checking in loop.Andreas Fischer2011-09-191-7/+4
| | | | | | | | | | | | PHPBB3-10370
| * | [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().Andreas Fischer2011-09-191-14/+2
|/ / | | | | | | PHPBB3-10370
* | Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympusNils Adermann2011-09-181-5/+21
|\ \ | | | | | | | | | | | | * github-bantu/ticket/10245: [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
| * | [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().Andreas Fischer2011-09-181-5/+21
| | | | | | | | | | | | PHPBB3-10245
* | | Merge remote-tracking branch 'github-bantu/ticket/10369' into develop-olympusNils Adermann2011-09-183-8/+67
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10369: [ticket/10369] Replace root path with "[ROOT]" as per IRC. [ticket/10369] Add warning about paths outside of phpBB root not being filtered [ticket/10369] Rename filter_errfile() to filter_root_path(). [ticket/10369] DRY code to remove phpbb path from errfile. [ticket/10369] Always include errfile and errline in format_errors().
| * | [ticket/10369] Replace root path with "[ROOT]" as per IRC.Andreas Fischer2011-09-181-1/+1
| | | | | | | | | | | | PHPBB3-10369
| * | [ticket/10369] Add warning about paths outside of phpBB root not being filteredAndreas Fischer2011-09-181-0/+2
| | | | | | | | | | | | PHPBB3-10369
| * | [ticket/10369] Rename filter_errfile() to filter_root_path().Andreas Fischer2011-09-182-4/+4
| | | | | | | | | | | | PHPBB3-10369
| * | [ticket/10369] DRY code to remove phpbb path from errfile.Andreas Fischer2011-09-182-6/+24
| | | | | | | | | | | | PHPBB3-10369
| * | [ticket/10369] Always include errfile and errline in format_errors().Andreas Fischer2011-09-182-5/+44
|/ / | | | | | | | | | | | | We remove the phpBB root path from errfile. This is consistent with how msg_handler handles E_WARNING messages etc. PHPBB3-10369
* | Merge remote-tracking branch 'galaxyAbstractor/ticket/10324' into ↵Andreas Fischer2011-09-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/10324: [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
| * | [ticket/10324] Fixed XHTML validity error in User Notes Prosilver themegalaxyAbstractor2011-09-171-1/+1
|/ / | | | | | | | | | | Replaced the deprecated align and width attributes with CSS. PHPBB3-10324
* | Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympusAndreas Fischer2011-09-061-1/+1
|\ \ | | | | | | | | | | | | * bantu/ticket/10294: [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
| * | [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.Andreas Fischer2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | sqlsrv_rows_affected() expects a statement resource, not a connection resource. PHPBB3-10294
* | | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympusAndreas Fischer2011-09-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * Noxwizard/ticket/10351: [ticket/10351] Fix Oracle's sql_column_remove()
| * | | [ticket/10351] Fix Oracle's sql_column_remove()Patrick Webster2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The correct syntax is DROP COLUMN. PHPBB3-10351
* | | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympusAndreas Fischer2011-09-061-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10352: [ticket/10352] Add missing break for Oracle's sql_table_drop()
| * | | | [ticket/10352] Add missing break for Oracle's sql_table_drop()Patrick Webster2011-09-041-0/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10352
* | | | Merge remote-tracking branch 'p/ticket/10354' into develop-olympusIgor Wiedler2011-09-051-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/10354: [ticket/10354] Include cache directory path in unwritable message.
| * | | | [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When template tests are skipped because cache directory is not writable, include path to the cache directory into the message saying it is not writable. PHPBB3-10354
* | | | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusIgor Wiedler2011-09-053-0/+123
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added optionset to mock_user in the tests. [ticket/10240] Fixed copyright year in censor_text_test.php. [ticket/10240] Fixed censor_text test assetEquals param order. [ticket/10240] Added censor_text tests for special characters. [ticket/10240] Added censor_text tests.
| * | | | | [ticket/10240] Added optionset to mock_user in the tests.Callum Macrae2011-08-232-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made optionset use the value set by optionset. We're not checking whether the option is set or not, because we would just throw an error if it wasn't set, and it throws an error anyway. PHPBB3-10240
| * | | | | [ticket/10240] Fixed copyright year in censor_text_test.php.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10240
| * | | | | [ticket/10240] Fixed censor_text test assetEquals param order.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, expected and input were the wrong way round. PHPBB3-10240
| * | | | | [ticket/10240] Added censor_text tests for special characters.Callum Macrae2011-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10240
| * | | | | [ticket/10240] Added censor_text tests.Callum Macrae2011-08-223-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB-10240
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-052-0/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | | | | [ticket/10321] Add descriptions to the unit testsJoas Schilling2011-08-211-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10321
| * | | | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-212-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10321
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10339: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| * | | | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10339
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10334: [ticket/10334] Require permissions to view the birthday-list on board index
| * | | | | | [ticket/10334] Require permissions to view the birthday-list on board indexJoas Schilling2011-08-231-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10334
* | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ↵Joas Schilling2011-08-292-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/bantu/10341 * remotes/bantu/ticket/10341: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| * | | | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-10341
* | | | | | Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346Joas Schilling2011-08-292-0/+77
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * remotes/naderman/ticket/10346: [ticket/10346] Add drop_tables to perform_schema_changes and add tests