generatefirstuser path

ciims · Dec 31, 2013 · 2afa66b · 2afa66b
1 parent b811db4
commit 2afa66b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/protected/commands/CiiSetupCommand.php b/protected/commands/CiiSetupCommand.php
@@ -75,7 +75,7 @@ private function generateHash($overrideConfig = false)
 
 			// If the params file already exists, import it
 			if (file_exists($paramsFile))
-				$params = require $paramsFile;
+				$params = CMap::mergeArray($paramsTemplate, require $paramsFile);
 
 			if (empty($params))
 				$params = $paramsTemplate;
@@ -164,4 +164,4 @@ public function getEncryptedPassword($email, $password, $hash)
         $hash = $this->encryptHash($email, $password, $hash);
         return password_hash($hash, PASSWORD_BCRYPT, array('cost' => 13));
     }
-}
+}