diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
commit | 87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (patch) | |
tree | ef227ad50cd25699d34dd1a3364ac0cf430443da /plugins/UserFlag | |
parent | a39a934dd4a133bad6e76fa9a5018cedcb70225c (diff) | |
parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/UserFlag')
-rw-r--r-- | plugins/UserFlag/clearflag.php | 2 | ||||
-rw-r--r-- | plugins/UserFlag/flagprofile.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UserFlag/clearflag.php b/plugins/UserFlag/clearflag.php index bd6732e2d..f032527ed 100644 --- a/plugins/UserFlag/clearflag.php +++ b/plugins/UserFlag/clearflag.php @@ -81,7 +81,7 @@ class ClearflagAction extends ProfileFormAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); if (!$this->boolean('ajax')) { - $this->returnToArgs(); + $this->returnToPrevious(); } } } diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index 2d0f0abb9..018c1e8ac 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -87,7 +87,7 @@ class FlagprofileAction extends ProfileFormAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); if (!$this->boolean('ajax')) { - $this->returnToArgs(); + $this->returnToPrevious(); } } } |