X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=3a93c466facd4ffe6b5707d01033cd4c81f2b6fc;hb=1ef5cf964ef65b248dc150660124e95dcd933106;hp=9f9c473b513d3436316f8b0dd9035f405ca47fda;hpb=52600ce0b063e68e622b19699841e41b5ddbf2d1;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index 9f9c473b51..3a93c466fa 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -44,19 +44,25 @@ class LoginAction extends Action {
 				return;
 			}
 			# success!
-			common_redirect(common_local_url('all',
-											 array('nickname' =>
-												   $nickname)));
+			$url = common_get_returnto();
+			if ($url) {
+				# We don't have to return to it again
+				common_set_returnto(NULL);
+			} else {
+				$url = common_local_url('all',
+										array('nickname' =>
+											  $nickname));
+			}
+			common_redirect($url);
 		} else {
 			$this->show_form(_t('Incorrect username or password.'));
 		}
 	}
 
 	function show_form($error=NULL) {
-
 		common_show_header(_t('Login'));
-		if (!is_null($error)) {
-			common_element('div', array('class' => 'error'), $msg);
+		if ($error) {
+			common_element('div', array('class' => 'error'), $error);
 		}
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'login',