Permalink
Browse files

Optimises configuration merging, removing empty values, in CaMykS lib…

…rary.
  • Loading branch information...
JB Lebrun
JB Lebrun committed Oct 23, 2018
1 parent 585ea87 commit e4468d43b9d264853f1a9ea7c351144c91ae1fcf
Showing with 5 additions and 3 deletions.
  1. +5 −3 Camyks.php.inc
@@ -4,9 +4,9 @@
* @details Engine / Main Object
* @file Camyks.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.4
* @version 1.0.5
* @date Creation: Jun 2005
* @date Modification: Jul 2018
* @date Modification: Oct 2018
* @copyright 2005 - 2018 CaMykS Team
* @note This program is distributed as is - WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -507,7 +507,9 @@ final class Camyks {
require_once ($this->camyks_path.'/engine/etc/static.php.inc');
/* merge engine and site configs */
$this->_conf = array_merge($this->_conf, $this->site_conf);
foreach ($this->site_conf as $name => $value)
if (!isset($this->_conf[$name]) or trim($value) != '')
$this->_conf[$name] = $value;
}
/**

0 comments on commit e4468d4

Please sign in to comment.