Merge branch 'admin-sections/4' into 0.9.x

[quix0rs-gnu-social.git] / lib / userprofile.php

diff --git a/lib/userprofile.php b/lib/userprofile.php
index 4321a2f93977cc3d4a990f2de5d954f34ad78879..ee205af85df86284feb3286398971bf744547aea 100644 (file)
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -285,8 +285,11 @@ class UserProfile extends Widget
 
                         // return-to args, so we don't have to keep re-writing them
 
-                        $r2args = array('action' => 'showstream',
-                                        'nickname' => $this->profile->nickname);
+                        list($action, $r2args) = $this->out->returnToArgs();
+
+                        // push the action into the list
+
+                        $r2args['action'] = $action;
 
                         // block/unblock
 
@@ -327,7 +330,7 @@ class UserProfile extends Widget
 
                         if ($cur->hasRight(Right::DELETEUSER)) {
                             $this->out->elementStart('li', 'entity_delete');
-                            $df = DeleteUserForm($this->out, $this->profile, $r2args);
+                            $df = new DeleteUserForm($this->out, $this->profile, $r2args);
                             $df->show();
                             $this->out->elementEnd('li');
                         }