Filling in missing endHTML calls for Action AJAX

[quix0rs-gnu-social.git] / actions / cancelgroup.php

diff --git a/actions/cancelgroup.php b/actions/cancelgroup.php
index 3074e3ffa3141db4fb47f851a0dbc92f76fc6eea..4196eb3ffc5e01356f79d948bbd7adae191e350f 100644 (file)
--- a/actions/cancelgroup.php
+++ b/actions/cancelgroup.php
@@ -63,7 +63,7 @@ class CancelgroupAction extends Action
         $nickname_arg = $this->trimmed('nickname');
         $id = intval($this->arg('id'));
         if ($id) {
-            $this->group = User_group::staticGet('id', $id);
+            $this->group = User_group::getKV('id', $id);
         } else if ($nickname_arg) {
             $nickname = common_canonical_nickname($nickname_arg);
 
@@ -74,7 +74,7 @@ class CancelgroupAction extends Action
                 return false;
             }
 
-            $local = Local_group::staticGet('nickname', $nickname);
+            $local = Local_group::getKV('nickname', $nickname);
 
             if (!$local) {
                 // TRANS: Client error displayed when trying to leave a non-local group.
@@ -82,7 +82,7 @@ class CancelgroupAction extends Action
                 return false;
             }
 
-            $this->group = User_group::staticGet('id', $local->group_id);
+            $this->group = User_group::getKV('id', $local->group_id);
         } else {
             // TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
             $this->clientError(_('No nickname or ID.'), 404);
@@ -103,7 +103,7 @@ class CancelgroupAction extends Action
         }
         if ($this->arg('profile_id')) {
             if ($cur->isAdmin($this->group)) {
-                $this->profile = Profile::staticGet('id', $this->arg('profile_id'));
+                $this->profile = Profile::getKV('id', $this->arg('profile_id'));
             } else {
                 // TRANS: Client error displayed when trying to approve or cancel a group join request without
                 // TRANS: being a group administrator.
@@ -162,7 +162,7 @@ class CancelgroupAction extends Action
             $jf = new JoinForm($this, $this->group);
             $jf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('groupmembers', array('nickname' =>
                                                                    $this->group->nickname)),