diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
commit | 39392e03a71d94d6b984033b994b417edfc2d8d6 (patch) | |
tree | cb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /actions/disfavor.php | |
parent | 727ea5a5163249eb40fa0c4b2c63054fc997473b (diff) | |
parent | 23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
Diffstat (limited to 'actions/disfavor.php')
-rw-r--r-- | actions/disfavor.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/disfavor.php b/actions/disfavor.php index 6269f1bd2..3ccdd69af 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -71,7 +71,7 @@ class DisfavorAction extends Action $notice = Notice::staticGet($id); $token = $this->trimmed('token-'.$notice->id); if (!$token || $token != common_session_token()) { - $this->clientError(_("There was a problem with your session token. Try again, please.")); + $this->clientError(_('There was a problem with your session token. Try again, please.')); return; } $fave = new Fave(); |