summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-10-19 15:10:47 -0700
committerBrion Vibber <brion@pobox.com>2010-10-19 15:10:47 -0700
commitd358c88f94a0acff779eb59fc35acbd81787008c (patch)
treec20ca2ca59a7f6808e8cd2f764995636a27773a6
parente13eb797c75b487d003d76c6a228d13cd5c1f1ac (diff)
parent53d45d7ffbe6bcdf336a0e666942557c11cf909b (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
-rw-r--r--actions/makeadmin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 9ccb44230..4e6e97a56 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -148,7 +148,7 @@ class MakeadminAction extends RedirectingAction
$this->group->getBestName());
}
- $this->returnToArgs();
+ $this->returnToPrevious();
}
/**