Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

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

diff --git a/plugins/QnA/actions/qnashowquestion.php b/plugins/QnA/actions/qnashowquestion.php
index c30464bbf61aed2efb03f27f17892512910ebf1c..edea032b388486c98d0e689b5d003ac226ef2d17 100644 (file)
--- a/plugins/QnA/actions/qnashowquestion.php
+++ b/plugins/QnA/actions/qnashowquestion.php
@@ -57,7 +57,7 @@ class QnashowquestionAction extends ShownoticeAction
      */
     function prepare($argarray)
     {
-        OwnerDesignAction::prepare($argarray);
+        Action::prepare($argarray);
 
         $this->id = $this->trimmed('id');
 
@@ -151,9 +151,9 @@ class QnashowquestionAction extends ShownoticeAction
      */
     function title()
     {
-        // TRANS: Page title for a question.
-        // TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
         return sprintf(
+            // TRANS: Page title for a question.
+            // TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
             _m('%1$s\'s question: %2$s'),
             $this->user->nickname,
             $this->question->title
@@ -168,7 +168,6 @@ class QnashowquestionAction extends ShownoticeAction
         return Action::lastModified();
     }
 
-
     /**
      * @fixme combine the notice time with question update time
      */