Merge branch 'master' into FeedPoller

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

diff --git a/actions/approvesub.php b/actions/approvesub.php
index 5fbb2149bd83d08555937c4a849e6422b1ca4dce..b92ad66e7ae16d65fc13fe61082dc90f3973e7f4 100644 (file)
--- a/actions/approvesub.php
+++ b/actions/approvesub.php
@@ -61,7 +61,7 @@ class ApprovesubAction extends Action
             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.'));
@@ -136,7 +136,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)),