Merge branch 'master' into 0.7.x

[quix0rs-gnu-social.git] / lib / noticeform.php

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0a4f486db216ba9b63072a377906f319bb924178..0c991c9695bc672bc0eebdb93234e5fbdf3be483 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -63,6 +63,12 @@ class NoticeForm extends Form
 
     var $content = null;
 
+    /**
+     * The current user
+     */
+
+    var $user = null;
+
     /**
      * Constructor
      *
@@ -71,12 +77,19 @@ class NoticeForm extends Form
      * @param string        $content content to pre-fill
      */
 
-    function __construct($out=null, $action=null, $content=null)
+    function __construct($out=null, $action=null, $content=null, $user=null)
     {
         parent::__construct($out);
 
         $this->action  = $action;
         $this->content = $content;
+        
+        if ($user) {
+            $this->user = $user;
+        } else {
+            $this->user = common_current_user();
+        }
+        
     }
 
     /**
@@ -121,12 +134,11 @@ class NoticeForm extends Form
 
     function formData()
     {
-        $user = common_current_user();
 
-        $this->out->elementStart('ul', 'form_datas');
+        $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li', array('id' => 'notice_text'));
         $this->out->element('label', array('for' => 'notice_data-text'),
-                            sprintf(_('What\'s up, %s?'), $user->nickname));
+                            sprintf(_('What\'s up, %s?'), $this->user->nickname));
         // XXX: vary by defined max size
         $this->out->element('textarea', array('id' => 'notice_data-text',
                                               'cols' => 35,
@@ -143,13 +155,9 @@ class NoticeForm extends Form
         $this->out->elementEnd('dl');
 
         if ($this->action) {
-        // FIXME: or VERIFY that notice_return-to doesn't break anything. Changed from 'returnto'
-            $this->out->hidden('notice_return-to', $this->action);
+            $this->out->hidden('notice_return-to', $this->action, 'returnto');
         }
-
-        // FIXME: Does this need to be checked like returnto?
-        $this->out->hidden('notice_in-reply-to', $this->action);
-
+        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
     }
 
     /**