diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-05-16 07:17:40 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-05-16 07:17:40 +0000 |
| commit | 2d9eaf01cf87f56f5b159ac25c588097316dd74f (patch) | |
| tree | fdd5adde3e2e46df01ee9a2e37f5f6f13c4375ec | |
| parent | f401bea1f3345c748b46976895c1ceecad6f6258 (diff) | |
| download | brdo-2d9eaf01cf87f56f5b159ac25c588097316dd74f.tar.gz brdo-2d9eaf01cf87f56f5b159ac25c588097316dd74f.tar.bz2 | |
#61150 by Zen, hook_user categories type should pass $account
| -rw-r--r-- | modules/user.module | 6 | ||||
| -rw-r--r-- | modules/user/user.module | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/user.module b/modules/user.module index 6406a826e..f1bce8332 100644 --- a/modules/user.module +++ b/modules/user.module @@ -802,7 +802,7 @@ function user_menu($may_cache) { 'type' => MENU_CALLBACK); if (arg(2) == 'edit') { - if (($categories = _user_categories()) && (count($categories) > 1)) { + if (($categories = _user_categories($account)) && (count($categories) > 1)) { foreach ($categories as $key => $category) { $items[] = array( 'path' => 'user/'. arg(1) .'/edit/'. $category['name'], @@ -2062,11 +2062,11 @@ function user_help_page() { /** * Retrieve a list of all user setting/information categories and sort them by weight. */ -function _user_categories() { +function _user_categories($account) { $categories = array(); foreach (module_list() as $module) { - if ($data = module_invoke($module, 'user', 'categories', NULL, NULL, '')) { + if ($data = module_invoke($module, 'user', 'categories', NULL, $account, '')) { $categories = array_merge($data, $categories); } } diff --git a/modules/user/user.module b/modules/user/user.module index 6406a826e..f1bce8332 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -802,7 +802,7 @@ function user_menu($may_cache) { 'type' => MENU_CALLBACK); if (arg(2) == 'edit') { - if (($categories = _user_categories()) && (count($categories) > 1)) { + if (($categories = _user_categories($account)) && (count($categories) > 1)) { foreach ($categories as $key => $category) { $items[] = array( 'path' => 'user/'. arg(1) .'/edit/'. $category['name'], @@ -2062,11 +2062,11 @@ function user_help_page() { /** * Retrieve a list of all user setting/information categories and sort them by weight. */ -function _user_categories() { +function _user_categories($account) { $categories = array(); foreach (module_list() as $module) { - if ($data = module_invoke($module, 'user', 'categories', NULL, NULL, '')) { + if ($data = module_invoke($module, 'user', 'categories', NULL, $account, '')) { $categories = array_merge($data, $categories); } } |