From b3efdf2109d47c09a3e2724fbd92df2634cca2d7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 1 Sep 2016 22:10:56 -0700 Subject: turn theme configuration into a class object --- Zotlabs/Module/Settings.php | 10 +++++----- Zotlabs/Module/Theme_info.php | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 43b35df23..cfaf07c45 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -276,9 +276,9 @@ class Settings extends \Zotlabs\Web\Controller { $newschema = $_POST['schema']; if($newschema === '---') $newschema = ''; - } - theme_post($a); + $theme_config->post(); + } } } @@ -1042,10 +1042,10 @@ class Settings extends \Zotlabs\Web\Controller { require_once($themeconfigfile); if(class_exists(ucfirst($theme) . 'Config')) { $clsname = ucfirst($theme) . 'Config'; - $theme_config = new $clsname(); - $schemas = $theme_config->get_schemas(); + $thm_config = new $clsname(); + $schemas = $thm_config->get_schemas(); + $theme_config = $thm_config->get(); } - $theme_config = theme_content($a); } // logger('schemas: ' . print_r($schemas,true)); diff --git a/Zotlabs/Module/Theme_info.php b/Zotlabs/Module/Theme_info.php index eb4a28279..91ca484b7 100644 --- a/Zotlabs/Module/Theme_info.php +++ b/Zotlabs/Module/Theme_info.php @@ -24,9 +24,8 @@ class Theme_info extends \Zotlabs\Web\Controller { $schemalist[] = [ 'key' => $k, 'val' => $v ]; } } - + $theme_config = $th_config->get(); } - $theme_config = theme_content($a); } $info = get_theme_info($theme); if($info) { -- cgit v1.2.3