From 162631d04b47d84bc2a66a5fc1e9e00325e3951b Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 6 Jan 2017 14:04:32 -0800 Subject: [PATCH] use e107::getTheme() during installation. --- e107_handlers/theme_handler.php | 4 ++-- install.php | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index a4ac85ebe..8c20b1a32 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -437,8 +437,8 @@ class e_theme if($path == "landingzero" ) { - e107::getMessage()->addDebug("

".$path."

"); - e107::getMessage()->addDebug(print_a($vars,true)); + // e107::getMessage()->addDebug("

".$path."

"); + // e107::getMessage()->addDebug(print_a($vars,true)); // $mes->addDebug("
"); } diff --git a/install.php b/install.php index 2c44a086b..84062f15c 100644 --- a/install.php +++ b/install.php @@ -1757,13 +1757,10 @@ if($this->pdo == true) return FALSE; } - require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php"); + // require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php"); + // $tm = new themeHandler; + $xmlArray = e107::getTheme()->parse_theme_xml($theme_folder); - $tm = new themeHandler; - $xmlArray = $tm->parse_theme_xml($theme_folder); - - // $xml = e107::getXml(); - // $xmlArray = $xml->loadXMLfile($path,'advanced'); return (is_array($xmlArray)) ? $xmlArray : FALSE; }