aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-04-13 13:51:18 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-04-13 13:51:18 +0000
commitfbed7386ead797982f18a4701d321ae782212f9e (patch)
tree8ccf14c8b4eecaa1a9f420c6f30bde14c0c5cb32 /phpBB/includes/acp
parenta6b423b3bd8c5bcc5f41ff920c8ec5d3c64f297b (diff)
downloadforums-fbed7386ead797982f18a4701d321ae782212f9e.tar
forums-fbed7386ead797982f18a4701d321ae782212f9e.tar.gz
forums-fbed7386ead797982f18a4701d321ae782212f9e.tar.bz2
forums-fbed7386ead797982f18a4701d321ae782212f9e.tar.xz
forums-fbed7386ead797982f18a4701d321ae782212f9e.zip
#43965
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9446 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
-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 3bf47d68e5..3bc4f36eca 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -3228,7 +3228,7 @@ parse_css_file = {PARSE_CSS_FILE}
$select_bf = '';
}
- $sql = "SELECT {$mode}_id, {$mode}_name, {$mode}_path, {$mode}_storedb, $select_bf
+ $sql = "SELECT {$mode}_id, {$mode}_name, {$mode}_path, {$mode}_storedb $select_bf
FROM $sql_from
WHERE {$mode}_name = '" . $db->sql_escape($cfg_data['inherit_from']) . "'
AND {$mode}_inherits_id = 0";
@@ -3252,6 +3252,7 @@ parse_css_file = {PARSE_CSS_FILE}
{
$inherit_id = 0;
$inherit_path = '';
+ $inherit_bf = false;
}