Andreas Fischer
86f8851c40
Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus
...
* naderman/ticket/10394:
[ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
2011-09-27 22:39:30 +02:00
Nils Adermann
b197ea56c2
[ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
...
PHPBB3-10394
2011-09-27 22:32:20 +02:00
Andreas Fischer
dad7aa9593
Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympus
...
* nickvergessen/ticket/10315:
[ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
2011-09-27 20:57:55 +02:00
Andreas Fischer
13b718e720
Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus
...
* naderman/ticket/10394:
[ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
2011-09-27 20:21:57 +02:00
Nils Adermann
b571b3e032
[ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
...
PHPBB3-10394
2011-09-27 17:31:24 +02:00
Joas Schilling
5b66413f69
[ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
...
PHPBB3-10315
2011-09-21 01:02:28 +02:00
Nils Adermann
cc2ecc9171
Merge remote-tracking branch 'github-bantu/ticket/10370' into develop-olympus
...
* 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().
2011-09-19 17:53:55 +02:00
Andreas Fischer
79ad3a3f32
[ticket/10370] Add function documentation for get_stacktrace().
...
PHPBB3-10370
2011-09-19 17:45:32 +02:00
Andreas Fischer
fc2af460ee
[ticket/10370] Explain that we are not the ones hiding backtrace pieces.
...
Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d.
PHPBB3-10370
2011-09-19 17:37:16 +02:00
Andreas Fischer
19ce73c884
[ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().
...
PHPBB3-10370
2011-09-19 17:37:16 +02:00
Andreas Fischer
8a84f42f7d
[ticket/10370] Add require_once to whitelisted functions.
...
PHPBB3-10370
2011-09-19 17:37:15 +02:00
Andreas Fischer
7965387201
[ticket/10370] Use single string instead of an array for arguments.
...
PHPBB3-10370
2011-09-19 17:37:15 +02:00
Andreas Fischer
0df7e5eefa
[ticket/10370] Ease up code checking for arguments of include etc.
...
PHPBB3-10370
2011-09-19 17:37:10 +02:00
Andreas Fischer
12530a763b
[ticket/10370] Use unset() on the first backtrace instead of checking in loop.
...
PHPBB3-10370
2011-09-19 16:58:25 +02:00
Andreas Fischer
9c0f75fd65
[ticket/10370] Use phpbb_filter_root_path() in get_backtrace().
...
PHPBB3-10370
2011-09-19 16:57:09 +02:00
Nils Adermann
410028eecf
Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympus
...
* github-bantu/ticket/10245:
[ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
2011-09-18 23:25:04 +02:00
Nils Adermann
94fead702a
Merge remote-tracking branch 'github-bantu/ticket/10369' into develop-olympus
...
* 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().
2011-09-18 23:20:45 +02:00
Andreas Fischer
1b390f0b49
[ticket/10369] Replace root path with "[ROOT]" as per IRC.
...
PHPBB3-10369
2011-09-18 23:03:28 +02:00
Andreas Fischer
c8564e6ce9
[ticket/10369] Add warning about paths outside of phpBB root not being filtered
...
PHPBB3-10369
2011-09-18 22:41:02 +02:00
Andreas Fischer
1ad97424a4
[ticket/10369] Rename filter_errfile() to filter_root_path().
...
PHPBB3-10369
2011-09-18 22:32:25 +02:00
Andreas Fischer
9006984d5a
[ticket/10369] DRY code to remove phpbb path from errfile.
...
PHPBB3-10369
2011-09-18 22:24:14 +02:00
Andreas Fischer
7b3f6cb219
[ticket/10369] Always include errfile and errline in format_errors().
...
We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.
PHPBB3-10369
2011-09-18 22:23:41 +02:00
Andreas Fischer
05515e0510
[ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
...
PHPBB3-10245
2011-09-18 22:04:34 +02:00
Andreas Fischer
eb8b1c333f
Merge remote-tracking branch 'galaxyAbstractor/ticket/10324' into develop-olympus
...
* galaxyAbstractor/ticket/10324:
[ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
2011-09-17 23:34:30 +02:00
galaxyAbstractor
94a0b7ef2e
[ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
...
Replaced the deprecated align and width attributes with CSS.
PHPBB3-10324
2011-09-17 21:59:11 +02:00
Andreas Fischer
92373e6d46
Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus
...
* bantu/ticket/10294:
[ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
2011-09-06 00:43:10 +02:00
Andreas Fischer
d28ec48675
Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympus
...
* Noxwizard/ticket/10351:
[ticket/10351] Fix Oracle's sql_column_remove()
2011-09-06 00:42:48 +02:00
Andreas Fischer
3801101f3b
Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympus
...
* Noxwizard/ticket/10352:
[ticket/10352] Add missing break for Oracle's sql_table_drop()
2011-09-06 00:42:40 +02:00
Igor Wiedler
4e2437a6c1
Merge remote-tracking branch 'p/ticket/10354' into develop-olympus
...
* p/ticket/10354:
[ticket/10354] Include cache directory path in unwritable message.
2011-09-05 09:14:30 +02:00
Igor Wiedler
85bdc65df1
Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus
...
* 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.
2011-09-05 09:07:52 +02:00
Oleg Pudeyev
cf5f0cce83
Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus
...
* nickvergessen/ticket/10321:
[ticket/10321] Add descriptions to the unit tests
[ticket/10321] Do not append the ? if the param-list is empty anyway.
2011-09-05 02:42:41 -04:00
Oleg Pudeyev
1061e881bd
[ticket/10354] Include cache directory path in unwritable message.
...
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
2011-09-05 01:20:57 -04:00
Patrick Webster
5c7f5f0516
[ticket/10352] Add missing break for Oracle's sql_table_drop()
...
PHPBB3-10352
2011-09-04 20:31:34 -05:00
Patrick Webster
d938d5d399
[ticket/10351] Fix Oracle's sql_column_remove()
...
The correct syntax is DROP COLUMN.
PHPBB3-10351
2011-09-04 20:22:36 -05:00
Andreas Fischer
8e5eacf692
Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympus
...
* nickvergessen/ticket/10339:
[ticket/10339] Remove invalid template loop variable from mcp_front.html
2011-08-30 01:52:17 +02:00
Andreas Fischer
1daefc6177
Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympus
...
* nickvergessen/ticket/10334:
[ticket/10334] Require permissions to view the birthday-list on board index
2011-08-30 01:39:14 +02:00
Joas Schilling
a73bc353d6
Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/10341
...
* remotes/bantu/ticket/10341:
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
2011-08-29 22:27:20 +02:00
Joas Schilling
6cde745e28
Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346
...
* remotes/naderman/ticket/10346:
[ticket/10346] Add drop_tables to perform_schema_changes and add tests
2011-08-29 20:56:06 +02:00
Nils Adermann
0f2e45800e
[ticket/10346] Add drop_tables to perform_schema_changes and add tests
...
PHPBB3-10346
2011-08-29 14:24:50 -04:00
Oleg Pudeyev
0d41385344
Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus
...
* nickvergessen/ticket/10253:
[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
2011-08-27 17:38:27 -04:00
Nils Adermann
dc9a771473
Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus
...
* github-bantu/ticket/10335:
[ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
2011-08-26 05:59:13 -04:00
Nils Adermann
0d4089da7f
Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus
...
* github-bantu/ticket/10320:
[ticket/10320] Exclude passworded forums when determining "Most active topic".
[ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:20:55 -04:00
Nils Adermann
d602f74866
Merge remote-tracking branch 'github-bantu/ticket/9995' into develop-olympus
...
* github-bantu/ticket/9995:
[ticket/9995] Do not run forum SQL query when marking the whole board read.
[ticket/9995] Always continue when harvesting $forum_ids for markread().
[ticket/9995] Remove useless statement from display_forums()
2011-08-25 23:12:22 -04:00
Nils Adermann
34491f5569
Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympus
...
* github-bantu/ticket/10222:
[ticket/10222] Also build language and styles changes in diff/patch format.
2011-08-25 22:57:39 -04:00
Andreas Fischer
7ae871dfae
[ticket/9995] Do not run forum SQL query when marking the whole board read.
...
PHPBB3-9995
2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d
[ticket/9995] Always continue when harvesting $forum_ids for markread().
...
PHPBB3-9995
2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f
[ticket/9995] Remove useless statement from display_forums()
...
The $forum_ids array is only used if $mark_read == 'forums'.
When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.
So this statement is never useful.
PHPBB3-9995
2011-08-26 03:29:05 +02:00
Andreas Fischer
d221d2f7e8
[ticket/10222] Also build language and styles changes in diff/patch format.
...
PHPBB3-10222
2011-08-25 19:35:01 +02:00
Andreas Fischer
4499be5795
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
...
PHPBB3-10341
2011-08-25 17:44:45 +02:00
Andreas Fischer
4f8bb02a57
[ticket/10320] Exclude passworded forums when determining "Most active topic".
...
PHPBB3-10320
2011-08-25 17:33:39 +02:00