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

kurund · kurund · commit a0831c527bfa · 2014-07-23T16:34:24.000+05:30
Crm 9419
diff --git a/admin/configure.php b/admin/configure.php
@@ -111,7 +111,12 @@ function civicrm_main() {
   );
 
   $liveSite = substr_replace(JURI::root(), '', -1, 1);
-  $siteKey = md5( uniqid( '', true ) . $liveSite );
+  if ($civicrmUpgrade && defined('CIVICRM_SITE_KEY')) {
+    $siteKey = CIVICRM_SITE_KEY;
+  }
+  else {
+    $siteKey = md5(uniqid( '', true ) . $liveSite);
+  }
 
   // generate backend settings file
   $string = civicrm_config(FALSE, $siteKey);
