Dev: Test if user config['config'] is an array before array_merge

LimeSurvey · Oct 4, 2012 · d85f0ae · d85f0ae
1 parent 8ed0a96
commit d85f0ae
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -42,7 +42,10 @@ public function __construct($config = null)
         if(file_exists(APPPATH . DIRECTORY_SEPARATOR. 'config' . DIRECTORY_SEPARATOR . 'config.php'))
         {
             $ls_config = require(APPPATH . DIRECTORY_SEPARATOR. 'config' . DIRECTORY_SEPARATOR . 'config.php');
-            $settings = array_merge($settings, $ls_config['config']);
+            if(is_array($ls_config['config']))
+            {
+                $settings = array_merge($settings, $ls_config['config']);
+            }
         }
 
         foreach ($settings as $key => $value)