Merge pull request #13235 from civicrm/5.8

[civicrm-core.git] / CRM / Core / Config.php

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index 14baccd3510bbf540346c75b484973fab1052071..fdfdc06b76e83c19b9c9c1a7caeda82f5a7d9955 100644 (file)
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -270,7 +270,6 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
    * @return string
    */
   public static function environment($env = NULL, $reset = FALSE) {
-    static $environment;
     if ($env) {
       $environment = $env;
     }
@@ -295,6 +294,7 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
 
     // clear all caches
     self::clearDBCache();
+    Civi::cache('session')->clear();
     CRM_Utils_System::flushCache();
 
     if ($sessionReset) {