- Patch #72290 by killes: split up the cache table.

1 files changed, 6 insertions, 5 deletions

diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 555e4cafc..abe3db056 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -181,11 +181,11 @@ function locale($string) {
 
   // Store database cached translations in a static var.
   if (!isset($locale_t)) {
-    $cache = cache_get("locale:$locale");
+    $cache = cache_get("locale:$locale", 'cache');
 
     if (!$cache) {
       locale_refresh_cache();
-      $cache = cache_get("locale:$locale");
+      $cache = cache_get("locale:$locale", 'cache');
     }
     $locale_t = unserialize($cache->data);
   }
@@ -225,7 +225,7 @@ function locale($string) {
         }
       }
       // Clear locale cache in DB
-      cache_clear_all("locale:$locale");
+      cache_clear_all("locale:$locale", 'cache');
     }
   }
 
@@ -246,7 +246,7 @@ function locale_refresh_cache() {
     while ($data = db_fetch_object($result)) {
       $t[$data->source] = (empty($data->translation) ? TRUE : $data->translation);
     }
-    cache_set("locale:$locale", serialize($t));
+    cache_set("locale:$locale", 'cache', serialize($t));
   }
 }
 
@@ -357,7 +357,8 @@ function locale_admin_manage_delete_form_submit($form_id, $form_values) {
   }
 
   // Changing the locale settings impacts the interface:
-  cache_clear_all();
+  cache_clear_all('*', 'cache_menu', TRUE);
+  cache_clear_all('*', 'cache_page', TRUE);
 
   return 'admin/settings/locale/language/overview';
 }