aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-12-22 16:56:55 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-12-22 16:56:55 +0000
commitba1d50559feb3532bad6a9e31b82883baf506cdf (patch)
treec84cee9d83544d6d317ba992e72b2a7bf7698bcc /phpBB/includes
parent1261e21eac472d9b523f2db2b2efdca93b7510f7 (diff)
downloadforums-ba1d50559feb3532bad6a9e31b82883baf506cdf.tar
forums-ba1d50559feb3532bad6a9e31b82883baf506cdf.tar.gz
forums-ba1d50559feb3532bad6a9e31b82883baf506cdf.tar.bz2
forums-ba1d50559feb3532bad6a9e31b82883baf506cdf.tar.xz
forums-ba1d50559feb3532bad6a9e31b82883baf506cdf.zip
Fix r10360, Bug #55665
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10361 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_styles.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index faa16570c5..d2a0f9210f 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -643,10 +643,11 @@ parse_css_file = {PARSE_CSS_FILE}
{
while (($file = readdir($dp)) !== false)
{
- if (!is_dir($file))
+ if (!is_dir($phpbb_root_path . 'styles/' . $file))
{
continue;
}
+
$subpath = ($mode != 'style') ? "$mode/" : '';
if ($file[0] != '.' && file_exists("{$phpbb_root_path}styles/$file/$subpath$mode.cfg"))
{