aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge remote-tracking branch 'cs278/ticket/10387' into developAndreas Fischer2011-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10387: [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
| * | | | | | | | | | [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.Chris Smith2011-09-251-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10387
* | | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2011-09-271-5/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of git://github.com/phpbb/phpbb3: [ticket/10392] Alter parent namespace stripping. [ticket/10392] Test for magic loop variables with nested namespaces. [ticket/10392] Missed fix for S_BLOCK_NAME. [ticket/10392] Fix access to nested special block variables.
| * | | | | | | | | | [ticket/10392] Alter parent namespace stripping.Chris Smith2011-09-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| * | | | | | | | | | [ticket/10392] Missed fix for S_BLOCK_NAME.Chris Smith2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| * | | | | | | | | | [ticket/10392] Fix access to nested special block variables.Chris Smith2011-09-261-4/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10392
* | | | | | | | | | Merge remote-tracking branch 'cs278/ticket/10384' into developAndreas Fischer2011-09-241-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10384: [ticket/10384] Language variable replacements should not check for var prefix. [ticket/10384] Update unit tests to test for failing variable.
| * | | | | | | | | [ticket/10384] Language variable replacements should not check for var prefix.Chris Smith2011-09-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10384
* | | | | | | | | | [ticket/10375] Rework $source_file setting.Chris Smith2011-09-211-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only set the file if an mtime check or recompile are required. PHPBB3-10375
* | | | | | | | | | [ticket/10375] Make _tpl_load() a little leaner.Chris Smith2011-09-211-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed duplicate variables - Set $source_file earlier for cache checks - Fixed useless mtime check PHPBB3-10375
* | | | | | | | | | [ticket/10375] Use existing method to generate cache file name.Chris Smith2011-09-211-2/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10375
* | | | | | | | | Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into ↵Nils Adermann2011-09-213-750/+106
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * github-cs278/feature/remove-db-styles: [feature/remove-db-styles] Remove forgotten template variables. [feature/remove-db-styles] Removed style.php! [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71. [feature/remove-db-styles] Update language to reflect removal of db storage. [feature/remove-db-styles] Mark log entrys as deprecated. [feature/remove-db-styles] Add error if template/theme file is unwritable. [feature/remove-db-styles] Add schema changes sinces 3.0.x. [feature/remove-db-styles] Readd table constant for upgrades etc. [feature/remove-db-styles] Update database schemas. [feature/remove-db-styles] Remove style.php DB storage. [feature/remove-db-styles] Remove parse_css_file option from themes. [feature/remove-db-styles] Remove DB theme handling code from session. [feature/remove-db-styles] ACP has forgotten how to store themes in the DB. [feature/remove-db-styles] Missed a few template DB bits in acp_styles. [feature/remove-db-styles] Removing unused methods from acp_style. [feature/remove-db-styles] Removed database storage of style components.
| * | | | | | | | | [feature/remove-db-styles] Remove forgotten template variables.Chris Smith2011-09-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Removed style.php!Chris Smith2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finally sanity has arrived! No more delivering CSS through PHP. Better 3 years late than never. PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.Chris Smith2011-09-201-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Add error if template/theme file is unwritable.Chris Smith2011-09-201-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Readd table constant for upgrades etc.Chris Smith2011-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed in f23b224b946b37c171add5953e832641bbb3a5c3. PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Remove style.php DB storage.Chris Smith2011-09-202-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all use of the DB for serving/caching the theme from style.php, acp_style no longer stores the theme modified time either. As a consequence currently all stylesheets will be served through style.php (with no caching) until imagesets are removed [PHPBB3-10336], then they can we served as static files by HTTPd. PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Remove DB theme handling code from session.Chris Smith2011-09-201-49/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.Chris Smith2011-09-201-120/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Missed a few template DB bits in acp_styles.Chris Smith2011-09-201-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Removing unused methods from acp_style.Chris Smith2011-09-201-176/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These got left behind in 6854d47. PHPBB3-9741
| * | | | | | | | | [feature/remove-db-styles] Removed database storage of style components.Chris Smith2011-09-203-352/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
* | | | | | | | | | Merge remote-tracking branch 'github-cs278/ticket/10374' into developNils Adermann2011-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-cs278/ticket/10374: [ticket/10374] Remove 'custom template' cache prefix.
| * | | | | | | | | [ticket/10374] Remove 'custom template' cache prefix.Chris Smith2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10374
* | | | | | | | | | [ticket/10371] Removing last mentions of imagesetVjacheslav Trushkin2011-09-201-4/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing last mentions of imageset PHPBB3-10371
* | | | | | | | | Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' ↵Nils Adermann2011-09-209-1040/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-cyberalien/feature/remove-imagesets: [feature/remove-imagesets] Script for converting imageset to css [feature/remove-imagesets] Changing subsilver [feature/remove-imagesets] Changing prosilver [feature/remove-imagesets] Adjustments to php files [feature/remove-imagesets] Changing admin control panel styles module [feature/remove-imagesets] Changing database structure [feature/remove-imagesets] Removing imageset files [feature/remove-imagesets] Moving images
| * | | | | | | | | [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-047-248/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Adjustments to php files PHPBB3-10336
| * | | | | | | | | [feature/remove-imagesets] Changing admin control panel styles moduleVjacheslav Trushkin2011-09-032-792/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing imagesets. Changing admin control panel styles module PHPBB3-10336
* | | | | | | | | | 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.