diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-10 05:25:36 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-10 05:25:36 -0500 |
| commit | 31eb45897a316bac2e56658866e11f04b06ee724 (patch) | |
| tree | 9ffb34b08f8f15dd67d52bbdece6afcf86f4e2a1 /phpBB/includes/acp/acp_styles.php | |
| parent | 062c951d3398e3fa2d0b930d84db56ad9bc6de1f (diff) | |
| parent | aa8f4000d30a3f89cb876eb14e3b7522c68f90f0 (diff) | |
| download | forums-31eb45897a316bac2e56658866e11f04b06ee724.tar forums-31eb45897a316bac2e56658866e11f04b06ee724.tar.gz forums-31eb45897a316bac2e56658866e11f04b06ee724.tar.bz2 forums-31eb45897a316bac2e56658866e11f04b06ee724.tar.xz forums-31eb45897a316bac2e56658866e11f04b06ee724.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10057] Fixes for a bunch of small problems.
[ticket/10035] ACP template edit feature allows to read any files on webserver.
[ticket/10057] Handle the case of missing interbase extension better.
[ticket/10057] Fixed wrong usage of sql_error again, in firebird.
[ticket/10057] Fixed usage of sql_error again.
[ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
[ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
[ticket/10057] Skip ibase_service_attach if firebird connection failed.
[ticket/10057] Check for interbase function existence.
[ticket/10057] Split statements in firebird dbal for readability.
[ticket/10057] Include error collector class file in postgres dbal.
[ticket/10057] Moved error collector class into its own file.
[ticket/10057] Use a class for error collection.
[ticket/10057] More informative error messages in postgres dbal.
[ticket/10057] No negative array indexing.
[ticket/10057] Report postgres db connection errors.
Diffstat (limited to 'phpBB/includes/acp/acp_styles.php')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 4f13ee376f..6a0d4c4c98 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -716,7 +716,7 @@ parse_css_file = {PARSE_CSS_FILE} $save_changes = (isset($_POST['save'])) ? true : false; // make sure template_file path doesn't go upwards - $template_file = str_replace('..', '.', $template_file); + $template_file = preg_replace('#\.{2,}#', '.', $template_file); // Retrieve some information about the template $sql = 'SELECT template_storedb, template_path, template_name |