diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index d978449ad..a71ca63d7 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -1014,9 +1014,10 @@ class e107 */ public static function getThemePref($pref_name = '', $default = null, $index = null) { + if($pref_name) $pref_name = '/'.$pref_name; - $tprefs = e107::getConfig()->getPref('sitetheme_pref'.$pref_name, $default, $index); - return !empty($tprefs) ?: array(); + $tprefs = self::getConfig()->getPref('sitetheme_pref'.$pref_name, $default, $index); + return !empty($tprefs) ? $tprefs : array(); } /** diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index 2f0ed73fe..de7a823f3 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -21,7 +21,7 @@ class theme_shortcodes extends e_shortcode function sc_bootstrap_branding() { - $pref = e107::pref('theme', 'branding', 'sitename'); + $pref = e107::pref('theme', 'branding'); switch($pref) {