dev: sql logging broke installer

LimeSurvey · Nov 11, 2012 · 82fc410 · 82fc410
1 parent c6a65f7
commit 82fc410
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -28,13 +28,12 @@ class LSYii_Application extends CWebApplication
     */
     public function __construct($config = null)
     {
-        if (!file_exists($config))
+        if (is_string($config) && !file_exists($config))
         {
             $config = APPPATH . 'config/config-sample' . EXT;
-        } else {
-            if(is_string($config)) {
-                $config = require($config);
-            }
+        } 
+        if(is_string($config)) {
+            $config = require($config);
         }
 
         if ($config['config']['debug'] == 2)