Merge pull request #22550 from eileenmcnaughton/tool_clean1

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

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index b11fc554e2b022414d5e04a64da7396c018ce26d..c1db7ff80906098b13ae85bf8d5d48a85edb2730 100644 (file)
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -66,14 +66,6 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
    */
   private static $_singleton = NULL;
 
-  /**
-   * The constructor. Sets domain id if defined, otherwise assumes
-   * single instance installation.
-   */
-  public function __construct() {
-    parent::__construct();
-  }
-
   /**
    * Singleton function used to manage this object.
    *
@@ -278,6 +270,8 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
     // clear all caches
     self::clearDBCache();
     Civi::cache('session')->clear();
+    Civi::cache('metadata')->clear();
+    CRM_Core_DAO_AllCoreTables::reinitializeCache();
     CRM_Utils_System::flushCache();
 
     if ($sessionReset) {
@@ -425,18 +419,6 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
       return TRUE;
     }
 
-    if ($path && preg_match('/^civicrm\/ajax\/l10n-js/', $path)
-      && !empty($_SERVER['HTTP_REFERER'])
-    ) {
-      $ref = parse_url($_SERVER['HTTP_REFERER']);
-      if (
-        (!empty($ref['path']) && preg_match('/civicrm\/upgrade/', $ref['path'])) ||
-        (!empty($ref['query']) && preg_match('/civicrm\/upgrade/', urldecode($ref['query'])))
-      ) {
-        return TRUE;
-      }
-    }
-
     return FALSE;
   }