From d908bead3b51f1345efe8aa1a4face99d6c6ff63 Mon Sep 17 00:00:00 2001 From: secretr Date: Mon, 22 Nov 2010 15:16:44 +0000 Subject: [PATCH] e107 path override issues solved --- e107_handlers/e107_class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index a0a258b06..ed2630881 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -248,7 +248,7 @@ class e107 */ public function initCore($e107_paths, $e107_root_path, $e107_config_mysql_info, $e107_config_override = array()) { - return $this->_init($e107_paths, $e107_root_path, $e107_config_mysql_info, $e107_config_override = array()); + return $this->_init($e107_paths, $e107_root_path, $e107_config_mysql_info, $e107_config_override); } /** @@ -311,7 +311,9 @@ class e107 */ public function setDirs($e107_dirs, $e107_config_override = array()) { - $this->e107_dirs = array_merge($this->defaultDirs($e107_dirs)/*, (array) $e107_dirs*/, (array) $e107_config_override); + $override = array_merge((array) $e107_dirs, (array) $e107_config_override); + // override all + $this->e107_dirs = array_merge($this->defaultDirs($override), $override); return $this; }