From 5f900b597f52dca982c4836235df864b6a492ba5 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 27 Sep 2015 14:40:19 -0400 Subject: [PATCH] CRM_Core_Config::$keyDisable - Restore property --- CRM/Core/Config/MagicMerge.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php index 979c583597..f8ea50f733 100644 --- a/CRM/Core/Config/MagicMerge.php +++ b/CRM/Core/Config/MagicMerge.php @@ -85,6 +85,7 @@ class CRM_Core_Config_MagicMerge { // "local" properties are unique to each instance of CRM_Core_Config (each request). 'doNotResetCache' => array('local'), 'inCiviCRM' => array('local'), + 'keyDisable' => array('local'), 'userFrameworkFrontend' => array('local'), 'userPermissionTemp' => array('local'), @@ -355,6 +356,7 @@ class CRM_Core_Config_MagicMerge { $this->locals = array( 'inCiviCRM' => FALSE, 'doNotResetCache' => 0, + 'keyDisable' => FALSE, 'initialized' => FALSE, 'userFrameworkFrontend' => FALSE, 'userPermissionTemp' => NULL, -- 2.25.1