Various schema issues.

This commit is contained in:
Thomas Willingham
2013-10-10 19:18:33 +01:00
parent d05899fb50
commit cdf608898a
4 changed files with 22 additions and 22 deletions

View File

@@ -30,7 +30,7 @@
}
// Load the owners pconfig
$background_colour = get_pconfig($uid, "redbasic", "background_colour");
$bgcolour = get_pconfig($uid, "redbasic", "background_colour");
$background_image = get_pconfig($uid, "redbasic", "background_image");
$item_colour = get_pconfig($uid, "redbasic", "item_colour");
$item_opacity = get_pconfig($uid, "redbasic", "item_opacity");
@@ -47,15 +47,15 @@
if (($schema) && ($schema != '---')) {
$schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
require_once ($schemefile);
}
// If we haven't got a schema, load the default. We shouldn't touch this - we
// should leave it for admins to define for themselves.
if (! $schema) {
if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
$schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
require_once ($schemefile);
}
// If we haven't got a schema, load the default. We shouldn't touch this - we
// should leave it for admins to define for themselves.
if (! $schema) {
if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
$schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
require_once ($schemefile);
}
}
}
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
@@ -68,8 +68,8 @@
$nav_bg_3 = "#f00";
$nav_bg_4 = "#b00";
}
if (! $background_colour)
$background_colour = "fff";
if (! $bgcolour)
$bgcolour = "fff";
if (! $background_image)
$background_image ='';
if (! $item_colour)
@@ -97,7 +97,7 @@ $options = array (
'$nav_bg_3' => $nav_bg_3,
'$nav_bg_4' => $nav_bg_4,
'$search_background' => $search_background,
'$background_colour' => $background_colour,
'$bgcolour' => $bgcolour,
'$background_image' => $background_image,
'$item_colour' => $item_colour,
'$item_opacity' => $item_opacity,