better error reporting for rememberme cookie handling

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

diff --git a/actions/disfavor.php b/actions/disfavor.php
index ef01e891f83bcd10c89c9959e1f63f09a5b3635e..6ac94d720ac48aeb09949630fd95ca81f4f0985b 100644 (file)
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -37,17 +37,17 @@ class DisfavorAction extends Action {
                        return;
                }
 
-               $token = $this->trimmed('token');
+               $id = $this->trimmed('notice');
+
+               $notice = Notice::staticGet($id);
+
+               $token = $this->trimmed('token-'.$notice->id);
 
                if (!$token || $token != common_session_token()) {
-                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
+                       $this->client_error(_("There was a problem with your session token. Try again, please."));
                        return;
                }
 
-               $id = $this->trimmed('notice');
-
-               $notice = Notice::staticGet($id);
-
                $fave = new Fave();
                $fave->user_id = $this->id;
                $fave->notice_id = $notice->id;
@@ -63,11 +63,13 @@ class DisfavorAction extends Action {
                        $this->server_error(_('Could not delete favorite.'));
                        return;
                }
+               
+               $user->blowFavesCache();
 
                if ($this->boolean('ajax')) {
                        common_start_html('text/xml');
                        common_element_start('head');
-                       common_element('title', _('Favor'));
+                       common_element('title', null, _('Add to favorites'));
                        common_element_end('head');
                        common_element_start('body');
                        common_favor_form($notice);