Merge branch '0.9.x'

diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 9ccb442308b2910b0fd815dd80fd03bfb9aa4629..4e6e97a5693c8c2456059afe5b19a463688c862d 100644 (file)
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -148,7 +148,7 @@ class MakeadminAction extends RedirectingAction
                                $this->group->getBestName());
         }
 
-        $this->returnToArgs();
+        $this->returnToPrevious();
     }
 
     /**