makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Inherit the bitfield

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9408 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2009-03-26 13:00:49 +00:00
parent bf2f19cffe
commit 3e6fbb1c6d
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/includes/acp/acp_styles.php
View file

@ -37,7 +37,10 @@ class acp_styles
// Hardcoded template bitfield to add for new templates // Hardcoded template bitfield to add for new templates
$bitfield = new bitfield(); $bitfield = new bitfield();
$bitfield->set(0); $bitfield->set(0);
$bitfield->set(1);
$bitfield->set(2);
$bitfield->set(3); $bitfield->set(3);
$bitfield->set(4);
$bitfield->set(8); $bitfield->set(8);
$bitfield->set(9); $bitfield->set(9);
$bitfield->set(11); $bitfield->set(11);
@ -3216,7 +3219,16 @@ parse_css_file = {PARSE_CSS_FILE}
if (isset($cfg_data['inherit_from']) && $cfg_data['inherit_from']) 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 FROM $sql_from
WHERE {$mode}_name = '" . $db->sql_escape($cfg_data['inherit_from']) . "' WHERE {$mode}_name = '" . $db->sql_escape($cfg_data['inherit_from']) . "'
AND {$mode}_inherits_id = 0"; AND {$mode}_inherits_id = 0";
@ -3231,6 +3243,7 @@ parse_css_file = {PARSE_CSS_FILE}
{ {
$inherit_id = $row["{$mode}_id"]; $inherit_id = $row["{$mode}_id"];
$inherit_path = $row["{$mode}_path"]; $inherit_path = $row["{$mode}_path"];
$inherit_bf = ($mode === 'template') ? $row["{$mode}_bitfield"] : false;
$cfg_data['store_db'] = $row["{$mode}_storedb"]; $cfg_data['store_db'] = $row["{$mode}_storedb"];
$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']; $sql_ary['bbcode_bitfield'] = $cfg_data['template_bitfield'];
} }
else if ($inherit_bf)
{
$sql_ary['bbcode_bitfield'] = $inherit_bf;
}
else else
{ {
$sql_ary['bbcode_bitfield'] = TEMPLATE_BITFIELD; $sql_ary['bbcode_bitfield'] = TEMPLATE_BITFIELD;