Merge pull request #447 from totten/7.x-master-20541

CRM-20541 - Use drupal_static() instead of static
civicrm · Jul 10, 2017 · f7ed137 · f7ed137
2 parents bba4daa + 9a6cd1b
commit f7ed137
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/civicrm.module b/civicrm.module
@@ -156,8 +156,8 @@ function civicrm_initialize() {
   }
   _civicrm_registerClassLoader();
 
-  static $initialized = FALSE;
-  static $failure = FALSE;
+  $initialized = &drupal_static('civicrm_initialize', FALSE);
+  $failure = &drupal_static('civicrm_initialize_failure', FALSE);
 
   if ($failure) {
     return FALSE;
@@ -687,7 +687,7 @@ function civicrm_user_form_validate($form, &$form_state) {
   // lets suppress key generation for all validation also
   civicrm_key_disable();
 
-  static $validated = FALSE;
+  $validated = &drupal_static(__FUNCTION__, FALSE);
 
   if ($validated) {
     return;