diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-10-10 19:18:33 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-10-10 19:18:33 +0100 |
| commit | cdf608898a1371a0dd5071d72e95944d809e2d79 (patch) | |
| tree | 98aa8e0e1ab89e727833796a9bd2b3db24040bef /view/theme/redbasic/php/style.php | |
| parent | d05899fb5014db3d86e34788aaac609f80e659f5 (diff) | |
| download | volse-hubzilla-cdf608898a1371a0dd5071d72e95944d809e2d79.tar.gz volse-hubzilla-cdf608898a1371a0dd5071d72e95944d809e2d79.tar.bz2 volse-hubzilla-cdf608898a1371a0dd5071d72e95944d809e2d79.zip | |
Various schema issues.
Diffstat (limited to 'view/theme/redbasic/php/style.php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index ad8dca9a2..738f98726 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -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, |