Merge pull request civicrm#20 from atif-shaikh/CRM-9419

kurund · kurund · commit 5f6a82f47083 · 2014-07-23T18:40:16.000+05:30
CRM-9419 Changes
diff --git a/admin/configure.php b/admin/configure.php
@@ -111,11 +111,15 @@ function civicrm_main() {
   );
 
   $liveSite = substr_replace(JURI::root(), '', -1, 1);
-  if ($civicrmUpgrade && defined('CIVICRM_SITE_KEY')) {
-    $siteKey = CIVICRM_SITE_KEY;
+  if ($civicrmUpgrade) {
+    require_once $configFile;
+    if (defined('CIVICRM_SITE_KEY')) {
+      $siteKey = CIVICRM_SITE_KEY;
+    }
   }
-  else {
-    $siteKey = md5(uniqid( '', true ) . $liveSite);
+
+  if (empty($siteKey)) {
+    $siteKey = md5( uniqid( '', true ) . $liveSite );
   }
 
   // generate backend settings file
