correcting useless code.

joomla · Nov 19, 2016 · 369c74f · 369c74f
1 parent d306211
commit 369c74f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
@@ -623,16 +623,16 @@ public function onUserLogin($user, $options = array())
 					}
 
 					// Retrieves the Itemid from a login form.
-					$uri    = new JUri($this->app->getUserState('users.login.form.return'));
-					$itemid = $uri->getVar('Itemid');
+					$uri = new JUri($this->app->getUserState('users.login.form.return'));
 
 					if ($active->params['login_redirect_url'])
 					{
-						// The login menu item form contains an internal URL redirection.
-						// This will override the automatic change to the user preferred site language.
-						$this->app->setUserState('users.login.form.return', JRoute::_($this->app->getUserState('users.login.form.return'), false));
+						/* The login menu item form contains an internal URL redirection.
+						   This will override the automatic change to the user preferred site language.
+						   We use the redirect as defined in the menu item.
+						*/
 					}
-					elseif ($itemid)
+					elseif ($uri->getVar('Itemid'))
 					{
 						// The login form contains a menu item redirection. Try to get associations from that menu item.
 						// If any association set to the user preferred site language, redirect to that page.