X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fprofileformaction.php;h=51c89a922ea9b57ac7ae73952b546b2c21a59b18;hb=4b4b763255ad3b2bff8f18da2bd3927b52a54e55;hp=0ffafe5fb8d1279aeea4828b4da54c38869dae7a;hpb=61098faf5dd2685ea00c110bb4a3c871da17a300;p=quix0rs-gnu-social.git

diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index 0ffafe5fb8..51c89a922e 100644
--- a/lib/profileformaction.php
+++ b/lib/profileformaction.php
@@ -60,7 +60,16 @@ class ProfileFormAction extends RedirectingAction
         $this->checkSessionToken();
 
         if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+                $this->clientError(_('Not logged in.'));
+            } else {
+                // Redirect to login.
+                common_set_returnto($this->selfUrl());
+                $user = common_current_user();
+                if (Event::handle('RedirectToLogin', array($this, $user))) {
+                    common_redirect(common_local_url('login'), 303);
+                }
+            }
             return false;
         }
 
@@ -97,7 +106,7 @@ class ProfileFormAction extends RedirectingAction
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->handlePost();
-            $this->returnToArgs();
+            $this->returnToPrevious();
         }
     }