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

[quix0rs-gnu-social.git] / plugins / QnA / actions / qnavote.php

diff --git a/plugins/QnA/actions/qnavote.php b/plugins/QnA/actions/qnavote.php
index df4898dfe9806fa7bdaf61c31c6703e66494cf0b..00395d82e50f418528559537ce04ba61cbd97d2f 100644 (file)
--- a/plugins/QnA/actions/qnavote.php
+++ b/plugins/QnA/actions/qnavote.php
@@ -74,7 +74,7 @@ class Qnavote extends Action
     {
         parent::prepare($argarray);
         if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
+            GNUsocial::setApi(true);
         }
 
         $this->user = common_current_user();
@@ -142,9 +142,7 @@ class Qnavote extends Action
         }
 
         if ($this->boolean('ajax')) {
-            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: Page title after sending in a vote for a question or answer.
             $this->element('title', null, _m('Answers'));
@@ -153,9 +151,9 @@ class Qnavote extends Action
             $form = new QnA_Answer($this->question, $this);
             $form->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
-            common_redirect($this->question->bestUrl(), 303);
+            common_redirect($this->question->getUrl(), 303);
         }
     }
 
@@ -186,7 +184,7 @@ class Qnavote extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
             $_SERVER['REQUEST_METHOD'] == 'HEAD') {