1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-16 10:32:08 +02:00

Installation

This commit is contained in:
Cameron 2017-02-03 07:56:54 -08:00
parent dacdb7841d
commit 71249c3f2c
2 changed files with 8 additions and 3 deletions

View File

@ -201,8 +201,13 @@ class e_theme
* @param null $key
* @return array|bool
*/
public function get($var, $key=null)
public function get($var=null, $key=null)
{
if(empty($var) && isset($this->_data[$this->_current]))
{
return $this->_data[$this->_current];
}
return isset($this->_data[$this->_current][$var]) ? $this->_data[$this->_current][$var] : false;
}

View File

@ -1760,9 +1760,9 @@ if($this->pdo == true)
// require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php");
// $tm = new themeHandler;
$xmlArray = e107::getTheme()->parse_theme_xml($theme_folder);
$xmlArray = e107::getTheme($theme_folder)->get();
return (is_array($xmlArray)) ? $xmlArray : FALSE;
return (is_array($xmlArray)) ? $xmlArray : false;
}
/**