aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-09-191-37/+20
|\ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 branch 'develop-olympus' into developNils Adermann2011-09-181-5/+21
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
| * 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 branch 'develop-olympus' into developNils Adermann2011-09-182-8/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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-181-5/+9
| |/ | | | | | | | | | | | | We remove the phpBB root path from errfile. This is consistent with how msg_handler handles E_WARNING messages etc. PHPBB3-10369
* | [ticket/10322] Separate template varref resolution from output generationPatrick Webster2011-09-161-38/+51
| | | | | | | | | | | | | | | | | | Most template variables can now have their PHP variable name resolved instead of only compiling directly. This allows for the use of block vars in INCLUDE statements. This does not work for language variables since they require multiple checks. Added tests for the new types of allowed INCLUDEs. PHPBB3-10322
* | [ticket/10322] Fix dynamic template includesPatrick Webster2011-09-081-1/+26
| | | | | | | | | | | | | | Dynamic template includes from variables was not implemented in the new templating system. PHPBB3-10322
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-062-2/+3
|\ \ | |/ | | | | | | | | | | * develop-olympus: [ticket/10352] Add missing break for Oracle's sql_table_drop() [ticket/10351] Fix Oracle's sql_column_remove() [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
| * 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 'igorw/ticket/10155' into developOleg Pudeyev2011-09-051-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10155: [ticket/10155] Briefly explain assets in coding-guidelines [ticket/10155] Move jQuery inclusion to footer [ticket/10155] Update to jQuery 1.6.2 [ticket/10155] Add jQuery to AUTHORS [ticket/10155] Add jQuery, introduce global assets path
| * | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10350: [ticket/10350] Script for testing eval renderer [ticket/10350] Fix for class phpbb_template_renderer_eval
| * | | | | [ticket/10350] Fix for class phpbb_template_renderer_evalVjacheslav Trushkin2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug in class phpbb_template_renderer_eval PHPBB3-10350
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-09-051-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | * develop-olympus: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-051-0/+6
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * 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] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-211-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10321
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-291-0/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10346] Add drop_tables to perform_schema_changes and add tests
| * | | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-291-0/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10346
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-261-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-261-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10335: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| | * | | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10335
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-252-1/+38
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-252-1/+38
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | * | | | | [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10320
| | * | | | | [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-251-0/+33
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10320
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-15/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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() Conflicts: phpBB/includes/functions_display.php
| * | | | | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| * | | | | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| * | | | | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.Andreas Fischer2011-08-214-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by 6b4d0a254218e8d40151ca1bdff8c439f89502e9. PHPBB3-10329
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-3/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10240] Reverted a commit which added buggy code.
| * | | | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 23:04:50 +0000