summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-04-07 20:00:48 +0000
committerDries Buytaert <dries@buytaert.net>2005-04-07 20:00:48 +0000
commit6ba8f32ccab1c50ca1ef9365fb795597f4f3878d (patch)
tree7069e8e0bade76932b9bc3817687be644de3c0ad
parent961cf7af4404cca36ec31a5327a484d7ca818f08 (diff)
downloadbrdo-6ba8f32ccab1c50ca1ef9365fb795597f4f3878d.tar.gz
brdo-6ba8f32ccab1c50ca1ef9365fb795597f4f3878d.tar.bz2
- Patch #13503 by chx: made the menu cache locale aware.
-rw-r--r--includes/menu.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index d9eac0b5d..488fec955 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -198,12 +198,13 @@ define('MENU_ACCESS_DENIED', 3);
function menu_get_menu() {
global $_menu;
global $user;
+ global $locale;
if (!isset($_menu['items'])) {
// _menu_build() may indirectly call this function, so prevent infinite loops.
$_menu['items'] = array();
- $cid = 'menu:'. $user->uid;
+ $cid = "menu:$user->uid:$locale";
if ($cached = cache_get($cid)) {
$_menu = unserialize($cached->data);
}