From 3d998fef73044693c70ac0c6a7285ff9668875aa Mon Sep 17 00:00:00 2001 From: Bob Vincent Date: Sun, 22 May 2011 22:20:05 -0400 Subject: [PATCH] Issue 49124: Point the user login block at 'user' instead of at the current page. --- modules/user/user.module | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/user/user.module b/modules/user/user.module index de72bafb740918b4af18c47f3159ec164aa8017b..5b4f75020f087744157e1c4fe2dad36fbc067464 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1264,7 +1264,7 @@ function user_user_categories() { } function user_login_block($form) { - $form['#action'] = url($_GET['q'], array('query' => drupal_get_destination())); + $form['#action'] = url('user', array('query' => drupal_get_destination())); $form['#id'] = 'user-login-form'; $form['#validate'] = user_login_default_validators(); $form['#submit'][] = 'user_login_submit'; @@ -1370,7 +1370,7 @@ function user_block_view($delta = '') { if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) { $block['subject'] = t('User login'); - $block['content'] = drupal_get_form('user_login_block'); + $block['content'] = drupal_get_form('user_login'); } return $block; -- 1.7.4.1