X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapprovesub.php;h=0e70e3429ec995781b8989d6da9a9340d2f6d9d5;hb=9b7773343460514c5c5811c9add5cd96a2770c42;hp=5fbb2149bd83d08555937c4a849e6422b1ca4dce;hpb=f79aec36feaa4760201a7e88d5b31513a3c458ba;p=quix0rs-gnu-social.git diff --git a/actions/approvesub.php b/actions/approvesub.php index 5fbb2149bd..0e70e3429e 100644 --- a/actions/approvesub.php +++ b/actions/approvesub.php @@ -50,7 +50,7 @@ class ApprovesubAction extends Action /** * Prepare to run */ - function prepare($args) + function prepare(array $args=array()) { parent::prepare($args); @@ -58,14 +58,12 @@ class ApprovesubAction extends Action if (empty($cur)) { // TRANS: Client error displayed trying to approve group membership while not logged in. $this->clientError(_('Must be logged in.'), 403); - return false; } if ($this->arg('profile_id')) { - $this->profile = Profile::staticGet('id', $this->arg('profile_id')); + $this->profile = Profile::getKV('id', $this->arg('profile_id')); } else { // TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve. $this->clientError(_('Must specify a profile.')); - return false; } $this->request = Subscription_queue::pkeyGet(array('subscriber' => $this->profile->id, @@ -99,7 +97,7 @@ class ApprovesubAction extends Action * * @return void */ - function handle($args) + function handle(array $args=array()) { parent::handle($args); $cur = common_current_user(); @@ -136,7 +134,7 @@ class ApprovesubAction extends Action $this->element('p', 'success', _('Subscription canceled.')); } $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); } else { common_redirect(common_local_url('subqueue', array('nickname' => $cur->nickname)),