diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-03-26 13:00:49 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-03-26 13:00:49 +0000 |
| commit | 3e6fbb1c6d07be14ee15df61838807be7a59b86e (patch) | |
| tree | 5befbc9fa81fa8119b514f9ad379a2cb393a659e /phpBB/includes/acp | |
| parent | bf2f19cffe0573ee20d5076d8bb415fa22500a8d (diff) | |
| download | forums-3e6fbb1c6d07be14ee15df61838807be7a59b86e.tar forums-3e6fbb1c6d07be14ee15df61838807be7a59b86e.tar.gz forums-3e6fbb1c6d07be14ee15df61838807be7a59b86e.tar.bz2 forums-3e6fbb1c6d07be14ee15df61838807be7a59b86e.tar.xz forums-3e6fbb1c6d07be14ee15df61838807be7a59b86e.zip | |
Inherit the bitfield
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9408 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 528f9e002d..3bf47d68e5 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -37,7 +37,10 @@ class acp_styles // Hardcoded template bitfield to add for new templates $bitfield = new bitfield(); $bitfield->set(0); + $bitfield->set(1); + $bitfield->set(2); $bitfield->set(3); + $bitfield->set(4); $bitfield->set(8); $bitfield->set(9); $bitfield->set(11); @@ -3216,7 +3219,16 @@ parse_css_file = {PARSE_CSS_FILE} if (isset($cfg_data['inherit_from']) && $cfg_data['inherit_from']) { - $sql = "SELECT {$mode}_id, {$mode}_name, {$mode}_path, {$mode}_storedb + if ($mode === 'template') + { + $select_bf = ', template_bitfield'; + } + else + { + $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"; @@ -3231,6 +3243,7 @@ parse_css_file = {PARSE_CSS_FILE} { $inherit_id = $row["{$mode}_id"]; $inherit_path = $row["{$mode}_path"]; + $inherit_bf = ($mode === 'template') ? $row["{$mode}_bitfield"] : false; $cfg_data['store_db'] = $row["{$mode}_storedb"]; $store_db = $row["{$mode}_storedb"]; } @@ -3261,6 +3274,10 @@ parse_css_file = {PARSE_CSS_FILE} { $sql_ary['bbcode_bitfield'] = $cfg_data['template_bitfield']; } + else if ($inherit_bf) + { + $sql_ary['bbcode_bitfield'] = $inherit_bf; + } else { $sql_ary['bbcode_bitfield'] = TEMPLATE_BITFIELD; |