From 9cea85065c6b039c99aa373132a91eae2e320ebb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 1 Apr 2011 02:35:05 -0700
Subject: [PATCH] Some work towards allowing revisions

---
 plugins/QnA/QnAPlugin.php                                 | 5 +++--
 plugins/QnA/actions/qnanewanswer.php                      | 3 +--
 .../lib/{qnaansweredform.php => qnareviseanswerform.php}  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename plugins/QnA/lib/{qnaansweredform.php => qnareviseanswerform.php} (93%)

diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index 228b571a6e..9a05eeb0b2 100644
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -82,13 +82,14 @@ class QnAPlugin extends MicroAppPlugin
         case 'QnanewanswerAction':
         case 'QnashowquestionAction':
         case 'QnashowanswerAction':
+        case 'QnareviseanswerAction':
         case 'QnavoteAction':
             include_once $dir . '/actions/'
                 . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'QnaquestionForm':
         case 'QnaanswerForm':
-        case 'QnaansweredForm':
+        case 'QnareviseanswerForm':
         case 'QnavoteForm':
             include_once $dir . '/lib/' . strtolower($cls).'.php';
             break;
@@ -327,7 +328,7 @@ class QnAPlugin extends MicroAppPlugin
                 $answer = $question->getAnswer($profile);
                 if ($answer) {
                     // User has already answer; show the results.
-                    $form = new QnaansweredForm($answer, $out);
+                    $form = new QnareviseanswerForm($answer, $out);
                 } else {
                     $form = new QnaanswerForm($question, $out);
                 }
diff --git a/plugins/QnA/actions/qnanewanswer.php b/plugins/QnA/actions/qnanewanswer.php
index d2558380e9..09d111040d 100644
--- a/plugins/QnA/actions/qnanewanswer.php
+++ b/plugins/QnA/actions/qnanewanswer.php
@@ -158,8 +158,7 @@ class QnanewanswerAction extends Action
             $this->element('title', null, _m('Answers'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            $form = new QnaanswerForm($this->question, $this);
-            $form->show();
+            $this->raw()
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
diff --git a/plugins/QnA/lib/qnaansweredform.php b/plugins/QnA/lib/qnareviseanswerform.php
similarity index 93%
rename from plugins/QnA/lib/qnaansweredform.php
rename to plugins/QnA/lib/qnareviseanswerform.php
index b1500140f3..48f47e5e98 100644
--- a/plugins/QnA/lib/qnaansweredform.php
+++ b/plugins/QnA/lib/qnareviseanswerform.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Form for answering a question
+ * Form for revising a question
  *
  * PHP version 5
  *
@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Form to add a new answer to a question
+ * Form to revise a question
  *
  * @category  QnA
  * @package   StatusNet
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class QnaansweredForm extends Form
+class QnareviseanswerForm extends Form
 {
     protected $question;
     protected $answer;
@@ -106,7 +106,7 @@ class QnaansweredForm extends Form
         $id       = "question-" . $question->id;
 
         $out->element('p', 'Your answer to:', $question->title);
-        $out->element('input', array('type' => 'text', 'name' => 'answer'));
+        $out->textarea('answerText', 'You said:', $this->answer->content);
     }
 
     /**