Commit 91704669 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review

Merge "Doing better check on whether a skin is being used (bug #1250235)"

parents 93ef3935 61538092
......@@ -276,7 +276,7 @@ if (get_config('viewmicroheaders')) {
$smarty->assign('maharalogofilename', 'images/site-logo-small.png');
// Support for normal, light, or dark small Mahara logo - to use with skins
if ($viewskin) {
if ($skin) {
if ($skindata['header_logo_image'] == 'light') {
$smarty->assign('maharalogofilename', 'images/site-logo-small-light.png');
}
......@@ -317,7 +317,7 @@ $title = hsc(TITLE);
if (!get_config('viewmicroheaders')) {
$smarty->assign('maintitle', $titletext);
if ($viewskin) {
if ($skin) {
if ($skindata['header_logo_image'] == 'light' || $skindata['header_logo_image'] == 'dark') {
// override the default $smarty->assign('sitelogo') that happens
// in the initial call to smarty()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment