remove 'nudge' -- it won't be in this release

[quix0rs-gnu-social.git] / actions / subscribe.php

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 8bb723799c3f37a311f84639c19ae5cf7b3910d7..20c258923bb0b2b33fed38d1d156e27e8cbe155a 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -41,13 +41,14 @@ class SubscribeAction extends Action {
                $token = $this->trimmed('token');
                
                if (!$token || $token != common_session_token()) {
-                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
                        return;
                }
 
                $other_nickname = $this->arg('subscribeto');
 
                $result=subs_subscribe_user($user, $other_nickname);
+               
                if($result != true) {
                        common_user_error($result);
                        return;
@@ -56,5 +57,4 @@ class SubscribeAction extends Action {
                common_redirect(common_local_url('subscriptions', array('nickname' =>
                                                                                                                                $user->nickname)));
        }
-
 }
\ No newline at end of file