diff options
| -rw-r--r-- | modules/user.module | 8 | ||||
| -rw-r--r-- | modules/user/user.module | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/modules/user.module b/modules/user.module index 7f93e0321..923805028 100644 --- a/modules/user.module +++ b/modules/user.module @@ -620,7 +620,11 @@ function user_menu() { 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); $items[] = array('path' => 'user/login', 'title' => t('log in'), - 'type' => MENU_CALLBACK); + 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); + $items[] = array('path' => 'user/register', 'title' => t('register'), + 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); + $items[] = array('path' => 'user/password', 'title' => t('request new password'), + 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/user', 'title' => t('users'), 'callback' => 'user_admin', 'access' => $access); @@ -1173,7 +1177,7 @@ function user_page() { $op = $_POST['op']; if (empty($op)) { - $op = arg(2); + $op = arg(2) ? arg(2) : arg(1); } switch ($op) { diff --git a/modules/user/user.module b/modules/user/user.module index 7f93e0321..923805028 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -620,7 +620,11 @@ function user_menu() { 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); $items[] = array('path' => 'user/login', 'title' => t('log in'), - 'type' => MENU_CALLBACK); + 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); + $items[] = array('path' => 'user/register', 'title' => t('register'), + 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); + $items[] = array('path' => 'user/password', 'title' => t('request new password'), + 'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/user', 'title' => t('users'), 'callback' => 'user_admin', 'access' => $access); @@ -1173,7 +1177,7 @@ function user_page() { $op = $_POST['op']; if (empty($op)) { - $op = arg(2); + $op = arg(2) ? arg(2) : arg(1); } switch ($op) { |