diff options
| -rw-r--r-- | Zotlabs/Module/Settings.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Theme_info.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index cfaf07c45..729a9b226 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -268,8 +268,8 @@ class Settings extends \Zotlabs\Web\Controller { // call theme_post only if theme has not been changed if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){ require_once($themeconfigfile); - if(class_exists(ucfirst($theme) . 'Config')) { - $clsname = ucfirst($theme) . 'Config'; + if(class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { + $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; $theme_config = new $clsname(); $schemas = $theme_config->get_schemas(); if(array_key_exists($_POST['schema'],$schemas)) diff --git a/Zotlabs/Module/Theme_info.php b/Zotlabs/Module/Theme_info.php index 91ca484b7..e27ec9444 100644 --- a/Zotlabs/Module/Theme_info.php +++ b/Zotlabs/Module/Theme_info.php @@ -15,8 +15,8 @@ class Theme_info extends \Zotlabs\Web\Controller { $theme_config = ""; if(($themeconfigfile = $this->get_theme_config_file($theme)) != null){ require_once($themeconfigfile); - if(class_exists(ucfirst($theme) . 'Config')) { - $clsname = ucfirst($theme) . 'Config'; + if(class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) { + $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config'; $th_config = new $clsname(); $schemas = $th_config->get_schemas(); if($schemas) { diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 2ee998e30..b03e94e46 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -1,5 +1,7 @@ <?php +namespace Zotlabs\Theme; + class RedbasicConfig { function get_schemas() { @@ -19,7 +21,7 @@ class RedbasicConfig { } function get() { - if(!local_channel()) { + if(! local_channel()) { return; } @@ -103,7 +105,7 @@ class RedbasicConfig { $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), - '$theme' => App::$channel['channel_theme'], + '$theme' => \App::$channel['channel_theme'], '$expert' => $expert, '$title' => t("Theme settings"), '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), |