X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FQnA%2Factions%2Fqnanewanswer.php;h=1a16a3fa6b9ad790950781b283d020825e729e22;hb=fb70dc02362155c8951a1a0ad66a668f1f857ca5;hp=4e2fa5d36cca94d9a84ad6b9d78ded4b5f65b7aa;hpb=bc66211565035ed5986390fdecd089cbbb8db959;p=quix0rs-gnu-social.git

diff --git a/plugins/QnA/actions/qnanewanswer.php b/plugins/QnA/actions/qnanewanswer.php
index 4e2fa5d36c..1a16a3fa6b 100644
--- a/plugins/QnA/actions/qnanewanswer.php
+++ b/plugins/QnA/actions/qnanewanswer.php
@@ -80,8 +80,8 @@ class QnanewanswerAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            // TRANS: Client exception thrown trying to answer a question while not logged in.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to answer a question while not logged in.
                 _m("You must be logged in to answer to a question."),
                 403
             );
@@ -93,11 +93,11 @@ class QnanewanswerAction extends Action
 
         $id = substr($this->trimmed('id'), 9);
 
-        $this->question = QnA_Question::staticGet('id', $id);
+        $this->question = QnA_Question::getKV('id', $id);
 
         if (empty($this->question)) {
-            // TRANS: Client exception thrown trying to respond to a non-existing question.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to respond to a non-existing question.
                 _m('Invalid or missing question.'),
                 404
             );
@@ -151,10 +151,8 @@ class QnanewanswerAction extends Action
         if ($this->boolean('ajax')) {
             common_debug("ajaxy part");
             $answer = $this->question->getAnswer($profile);
-            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 an answer.
             $this->element('title', null, _m('Answers'));
@@ -162,15 +160,14 @@ class QnanewanswerAction extends Action
 
             $this->elementStart('body');
 
-            
             $nli = new NoticeAnswerListItem($notice, $this, $this->question, $answer);
             $nli->show();
-  
+
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_debug("not ajax");
-            common_redirect($this->question->bestUrl(), 303);
+            common_redirect($this->question->getUrl(), 303);
         }
     }
 
@@ -200,7 +197,7 @@ class QnanewanswerAction 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') {
@@ -224,12 +221,12 @@ class QnanewanswerAction extends Action
         $this->startHTML('text/xml;charset=utf-8', true);
         $this->elementStart('head');
         // TRANS: Page title after an AJAX error occurs on the post answer page.
-        $this->element('title', null, _('Ajax Error'));
+        $this->element('title', null, _m('Ajax Error'));
         $this->elementEnd('head');
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $msg);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
@@ -255,7 +252,7 @@ class QnanewanswerAction extends Action
         $form->show();
 
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
@@ -278,7 +275,6 @@ class QnanewanswerAction extends Action
         $this->msg = $msg;
         $this->showPage();
     }
-
 }
 
 class NoticeAnswerListItem extends NoticeListItem
@@ -330,7 +326,7 @@ class NoticeAnswerListItem extends NoticeListItem
      */
     function showContent()
     {
-        $this->out->elementStart('p', array('class' => 'entry-content answer-content'));
+        $this->out->elementStart('p', array('class' => 'e-content answer-content'));
         if ($this->notice->rendered) {
             $this->out->raw($this->notice->rendered);
         } else {
@@ -344,10 +340,10 @@ class NoticeAnswerListItem extends NoticeListItem
             $form = new QnashowanswerForm($this->out, $this->answer);
             $form->show();
         } else {
+            // TRANS: Error message displayed when an answer has no content.
             $out->text(_m('Answer data is missing.'));
         }
 
         $this->out->elementEnd('p');
     }
-
-}
\ No newline at end of file
+}