Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / UserFlag / actions / flagprofile.php

diff --git a/plugins/UserFlag/actions/flagprofile.php b/plugins/UserFlag/actions/flagprofile.php
index 7096d3748e4cb9fd3cfe2edab43264799d71e6a2..707b9ec0ed13dce8b579a366a747e474697ee396 100644 (file)
--- a/plugins/UserFlag/actions/flagprofile.php
+++ b/plugins/UserFlag/actions/flagprofile.php
@@ -49,7 +49,7 @@ class FlagprofileAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
@@ -73,7 +73,7 @@ class FlagprofileAction extends ProfileFormAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->handlePost();
@@ -117,9 +117,7 @@ class FlagprofileAction extends ProfileFormAction
      */
     function ajaxResults()
     {
-        header('Content-Type: text/xml;charset=utf-8');
-        $this->xw->startDocument('1.0', 'UTF-8');
-        $this->elementStart('html');
+        $this->startHTML('text/xml;charset=utf-8');
         $this->elementStart('head');
         // TRANS: AJAX form title for a flagged profile.
         $this->element('title', null, _m('Flagged for review'));
@@ -128,6 +126,6 @@ class FlagprofileAction extends ProfileFormAction
         // TRANS: Body text for AJAX form when a profile has been flagged for review.
         $this->element('p', 'flagged', _m('Flagged'));
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 }