aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2006-08-03 21:00:51 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2006-08-03 21:00:51 +0000
commit0a007bd5d746892459201306363c38cbdec36bc2 (patch)
tree42a5b627170433e73ee7d04ef9f8352a22ff6feb /phpBB
parent6742bcece73cfb1fe5d3a1d3d00c4994b8fe001a (diff)
downloadforums-0a007bd5d746892459201306363c38cbdec36bc2.tar
forums-0a007bd5d746892459201306363c38cbdec36bc2.tar.gz
forums-0a007bd5d746892459201306363c38cbdec36bc2.tar.bz2
forums-0a007bd5d746892459201306363c38cbdec36bc2.tar.xz
forums-0a007bd5d746892459201306363c38cbdec36bc2.zip
Deal with incorrect keys in the config file
git-svn-id: file:///svn/phpbb/trunk@6236 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_styles.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 6c557807bb..c2989174a1 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -2927,13 +2927,17 @@ pagination_sep = \'{PAGINATION_SEP}\'
else
{
$cfg_data = parse_cfg_file("$root_path$mode/imageset.cfg");
+ $imageset_definitions = explode(', ', $this->imageset_keys);
foreach ($cfg_data as $key => $value)
{
if (strpos($key, 'img_') === 0)
{
$key = substr($key, 4);
- $sql_ary[$key] = str_replace('{PATH}', "styles/$path/imageset/", trim($value));
+ if (in_array($key, $imageset_definitions))
+ {
+ $sql_ary[$key] = str_replace('{PATH}', "styles/$path/imageset/", trim($value));
+ }
}
}
unset($cfg_data);