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

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

diff --git a/plugins/QnA/actions/qnashowanswer.php b/plugins/QnA/actions/qnashowanswer.php
index d90b5c7ac68ee0be9ea5719cc97db77ac96c71f4..ab432d97d9b5d61088c664827319bc3b18fc9c59 100644 (file)
--- a/plugins/QnA/actions/qnashowanswer.php
+++ b/plugins/QnA/actions/qnashowanswer.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class QnashowanswerAction extends ShownoticeAction
 {
     protected $answer = null;
@@ -56,39 +55,52 @@ class QnashowanswerAction extends ShownoticeAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
-        OwnerDesignAction::prepare($argarray);
+        Action::prepare($argarray);
 
         $this->id = $this->trimmed('id');
 
-        $this->answer = QnA_Answer::staticGet('id', $this->id);
+        $this->answer = QnA_Answer::getKV('id', $this->id);
 
         if (empty($this->answer)) {
-            throw new ClientException(_('No such answer.'), 404);
+            // TRANS: Client exception thrown when requesting a non-existing answer.
+            throw new ClientException(_m('No such answer.'), 404);
+        }
+
+        $this->question = $this->answer->getQuestion();
+
+        if (empty($this->question)) {
+            // TRANS: Client exception thrown when requesting an answer that has no connected question.
+            throw new ClientException(_m('No question for this answer.'), 404);
         }
 
-        $this->notice = Notice::staticGet('uri', $this->answer->uri);
+        $this->notice = Notice::getKV('uri', $this->answer->uri);
 
         if (empty($this->notice)) {
-            // Did we used to have it, and it got deleted?
-            throw new ClientException(_('No such answer.'), 404);
+            // TRANS: Did we used to have it, and it got deleted?
+            throw new ClientException(_m('No such answer.'), 404);
         }
 
-        $this->user = User::staticGet('id', $this->answer->profile_id);
+        $this->user = User::getKV('id', $this->answer->profile_id);
 
         if (empty($this->user)) {
-            throw new ClientException(_('No such user.'), 404);
+            // TRANS: Client exception thrown when requesting answer data for a non-existing user.
+            throw new ClientException(_m('No such user.'), 404);
         }
 
         $this->profile = $this->user->getProfile();
 
         if (empty($this->profile)) {
-            throw new ServerException(_('User without a profile.'));
+            // TRANS: Client exception thrown when requesting answer data for a user without a profile.
+            throw new ServerException(_m('User without a profile.'));
         }
 
-        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        try {
+            $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        } catch (Exception $e) {
+            $this->avatar = null;
+        }
 
         return true;
     }
@@ -100,14 +112,17 @@ class QnashowanswerAction extends ShownoticeAction
      *
      * @return string page tile
      */
-
     function title()
     {
         $question = $this->answer->getQuestion();
 
-        return sprintf(_('%s\'s answer to "%s"'),
-                       $this->user->nickname,
-                       $question->title);
+        return sprintf(
+            // TRANS: Page title.
+            // TRANS: %1$s is the user who answered a question, %2$s is the question.
+            _m('%1$s\'s answer to "%2$s"'),
+            $this->user->nickname,
+            $question->title
+        );
     }
 
     /**
@@ -115,15 +130,19 @@ class QnashowanswerAction extends ShownoticeAction
      *
      * @return void
      */
-
     function showPageTitle()
     {
         $this->elementStart('h1');
         $this->element(
             'a',
-            array('href' => $this->answer->url),
-            $this->answer->title
+            array('href' => $this->answer->uri),
+            $this->question->title
         );
         $this->elementEnd('h1');
     }
+
+    function showContent()
+    {
+        $this->raw($this->answer->asHTML());
+    }
 }