Skip to content

GitLab

D
drupal
Commit 16d3f9bc authored by Dries's avatar Dries
Browse files
Options 

- Patch #10845 by James: fixed the user/help page.
parent 228b3c7c
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
modules/user.module
View file @ 16d3f9bc
......@@ -601,6 +601,8 @@ function user_menu($may_cache) {
'callback' => 'user_page', 'access' => $user->uid == 0 && variable_get('user_register', 1), 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'user/password', 'title' => t('request new password'),
'callback' => 'user_page', 'access' => $user->uid == 0, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'user/help', 'title' => t('help'),
'callback' => 'user_help_page', 'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/user', 'title' => t('users'),
'callback' => 'user_admin', 'access' => $access);
......@@ -1634,10 +1636,10 @@ function user_help($section) {
}
/**
* Menu callback; Prints user-specific information from admin/help.
* Menu callback; Prints user-specific help information.
*/
function user_help_page() {
print theme('page', user_help('admin/help#user'));
print theme('page', user_help('user/help#user'));
}
/**
......
modules/user/user.module
View file @ 16d3f9bc
......@@ -601,6 +601,8 @@ function user_menu($may_cache) {
'callback' => 'user_page', 'access' => $user->uid == 0 && variable_get('user_register', 1), 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'user/password', 'title' => t('request new password'),
'callback' => 'user_page', 'access' => $user->uid == 0, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'user/help', 'title' => t('help'),
'callback' => 'user_help_page', 'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/user', 'title' => t('users'),
'callback' => 'user_admin', 'access' => $access);
......@@ -1634,10 +1636,10 @@ function user_help($section) {
}
/**
* Menu callback; Prints user-specific information from admin/help.
* Menu callback; Prints user-specific help information.
*/
function user_help_page() {
print theme('page', user_help('admin/help#user'));
print theme('page', user_help('user/help#user'));
}
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment