From a243145d3fef5996394518a2a3a9f8254ed2202a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 16 May 2007 13:45:17 +0000
Subject: - Patch #137767 by chx and pwolanin: multiple menu support.

---
 modules/user/user.module | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'modules/user/user.module')

diff --git a/modules/user/user.module b/modules/user/user.module
index 3b36beba2..73672b741 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -966,10 +966,14 @@ function user_init() {
 }
 
 function user_current_load($arg) {
-  return user_load($arg);
+  return $arg ? user_load($arg) : user_load($GLOBALS['user']->uid);
 }
 
-function user_current_to_arg() {
+function user_current_to_arg($arg) {
+
+  if (is_numeric($arg)) {
+    return $arg;
+  }
   return $GLOBALS['user']->uid;
 }
 
@@ -2034,8 +2038,8 @@ function user_admin_perm_submit($form_values, $form, &$form_state) {
 
   drupal_set_message(t('The changes have been saved.'));
 
-  // Clear the cached pages and menus:
-  menu_rebuild();
+  // Clear the cached pages
+  cache_clear_all();
 
 }
 
-- 
cgit v1.2.3