From 84d0a730d33531b6c36f62c632dd669413fc31c1 Mon Sep 17 00:00:00 2001 From: Darren Oh Date: Tue, 4 Jun 2013 17:23:19 -0400 Subject: [PATCH] Issue #123217 by Darren Oh: Fixed user login block action. --- core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php index dd890bd..16c3b16 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php +++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php @@ -39,7 +39,7 @@ protected function blockBuild() { unset($form['pass']['#description']); $form['name']['#size'] = 15; $form['pass']['#size'] = 15; - $form['#action'] = url(current_path(), array('query' => drupal_get_destination(), 'external' => FALSE)); + $form['#action'] = url(('destination=' . current_path() == drupal_get_destination() ? NULL : current_path()), array('query' => drupal_get_destination(), 'external' => FALSE)); // Build action links. $items = array(); if (config('user.settings')->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY) { -- 1.8.2