Installer fixes, use internal.php also when no config found

jlpoolen · Mar 26, 2013 · c719079 · c719079
1 parent 7df1d6f
commit c719079
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -39,7 +39,12 @@
 	)
 );
 
-$userConfig = require(dirname(__FILE__) . '/config.php');
+if (!file_exists(APPPATH . 'config/config.php')) {
+    $userConfig = require(dirname(__FILE__) . '/config-sample-mysql.php');
+} else {
+    $userConfig = require(dirname(__FILE__) . '/config.php');
+}
+
 return CMap::mergeArray($internalConfig, $userConfig);
 /* End of file internal.php */
 /* Location: ./application/config/internal.php */
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -3469,7 +3469,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
             $insertdata['wishSID']=$iOldSID;
         }
 
-        if ($iDBVersion<=143)
+        if ($iDBVersion<145)
         {
             if(isset($insertdata['private'])) $insertdata['anonymized']=$insertdata['private'];
             unset($insertdata['private']);

diff --git a/index.php b/index.php
@@ -175,13 +175,10 @@
 require_once BASEPATH . 'yii' . EXT;
 require_once APPPATH . 'core/LSYii_Application' . EXT;
 
-$config = APPPATH . 'config/internal' . EXT;
+$config = require_once(APPPATH . 'config/internal' . EXT);
 
-if (!file_exists(APPPATH . 'config/config' . EXT)) {
-    $config = APPPATH . 'config/config-sample-mysql' . EXT;        
-
+if (!file_exists(APPPATH . 'config/config' . EXT)) {    
     // If Yii can not start due to unwritable runtimePath, present an error    
-    $config = require($config);
     $runtimePath = $config['runtimePath'];
     if (!is_dir($runtimePath) || !is_writable($runtimePath)) {
         // @@TODO: present html page styled like the installer