diff --git a/app/code/core/Mage/Admin/Model/Resource/Block.php b/app/code/core/Mage/Admin/Model/Resource/Block.php index 9d813502937..bec218c7fcf 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Block.php +++ b/app/code/core/Mage/Admin/Model/Resource/Block.php @@ -70,7 +70,7 @@ protected function _generateCache() Mage::app()->saveCache( Mage::helper('core')->jsonEncode($data), self::CACHE_ID, - [Mage_Core_Model_App::CACHE_TAG] + [Mage_Core_Model_Resource_Db_Collection_Abstract::CACHE_TAG] ); } diff --git a/app/code/core/Mage/Admin/Model/Resource/Variable.php b/app/code/core/Mage/Admin/Model/Resource/Variable.php index bef4a9d08cb..05264f8fee1 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Variable.php +++ b/app/code/core/Mage/Admin/Model/Resource/Variable.php @@ -38,7 +38,7 @@ protected function _generateCache() Mage::app()->saveCache( Mage::helper('core')->jsonEncode($data), self::CACHE_ID, - [Mage_Core_Model_App::CACHE_TAG] + [Mage_Core_Model_Resource_Db_Collection_Abstract::CACHE_TAG] ); } diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index 63fcd034ea8..e6750cf4ace 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -36,12 +36,6 @@ class Mage_Core_Model_App public const DISTRO_LOCALE_CODE = 'en_US'; - /** - * Cache tag for all cache data exclude config cache - * - */ - public const CACHE_TAG = 'MAGE'; - /** * Default store Id (for install) */ diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php index 3e2c236d69c..bc34eb5072f 100644 --- a/app/code/core/Mage/Core/Model/Cache.php +++ b/app/code/core/Mage/Core/Model/Cache.php @@ -381,12 +381,6 @@ public function save($data, $id, $tags = [], $lifeTime = null) return true; } - /** - * Add global magento cache tag to all cached data exclude config cache - */ - if (!in_array(Mage_Core_Model_Config::CACHE_TAG, $tags)) { - $tags[] = Mage_Core_Model_App::CACHE_TAG; - } return $this->getFrontend()->save((string)$data, $this->_id($id), $this->_tags($tags), $lifeTime); } @@ -427,8 +421,7 @@ public function clean($tags = []) } $res = $this->getFrontend()->clean($mode, $this->_tags($tags)); } else { - $res = $this->getFrontend()->clean($mode, [Mage_Core_Model_App::CACHE_TAG]); - $res = $res && $this->getFrontend()->clean($mode, [Mage_Core_Model_Config::CACHE_TAG]); + $this->flush(); } return $res; } diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php index cce44677818..5da86165218 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php @@ -687,7 +687,6 @@ protected function _saveCache($data, $select) protected function _getCacheTags() { $tags = parent::_getCacheTags(); - $tags[] = Mage_Core_Model_App::CACHE_TAG; $tags[] = self::CACHE_TAG; return $tags; }