mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

e107 path override issues solved

Browse Source
This commit is contained in:
secretr
2010-11-22 15:16:44 +00:00
parent e376b00298
commit d908bead3b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/e107_class.php
View File

@@ -248,7 +248,7 @@ class e107
*/ */
public function initCore($e107_paths, $e107_root_path, $e107_config_mysql_info, $e107_config_override = array()) 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()) 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; return $this;
} }