diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index a12ed136330..0a1eec21d34 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -272,6 +272,7 @@ class DatabaseBackend implements CacheBackendInterface { $query_tags[] = $tag; } } + if ($query_tags) { try { if ($db_tags = Database::getConnection()->query('SELECT tag, invalidations FROM {cache_tags} WHERE tag IN (:tags)', array(':tags' => $query_tags))->fetchAllKeyed()) { diff --git a/core/lib/Drupal/Core/Config/CachedStorage.php b/core/lib/Drupal/Core/Config/CachedStorage.php index ccbc4c98545..35492cb7b75 100644 --- a/core/lib/Drupal/Core/Config/CachedStorage.php +++ b/core/lib/Drupal/Core/Config/CachedStorage.php @@ -69,7 +69,7 @@ class CachedStorage implements StorageInterface { // Read from the storage on a cache miss and cache the data, if any. $data = $this->storage->read($name); if ($data !== FALSE) { - $this->cache->set($name, $data, CacheBackendInterface::CACHE_PERMANENT, array('config' => array($name))); + $this->cache->set($name, $data, CacheBackendInterface::CACHE_PERMANENT); } // If the cache contained bogus data and there is no data in the storage, // wipe the cache entry. @@ -86,7 +86,7 @@ class CachedStorage implements StorageInterface { if ($this->storage->write($name, $data)) { // While not all written data is read back, setting the cache instead of // just deleting it avoids cache rebuild stampedes. - $this->cache->set($name, $data, CacheBackendInterface::CACHE_PERMANENT, array('config' => array($name))); + $this->cache->set($name, $data, CacheBackendInterface::CACHE_PERMANENT); return TRUE; } return FALSE;