Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

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

diff --git a/lib/messageform.php b/lib/messageform.php
index 61d3d75af26face5c970bb7e0d78b73d3f847567..b8878ec1f9f4d95bb659edb147e1160fc5e10f11 100644 (file)
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -99,7 +99,6 @@ class MessageForm extends Form
         return common_local_url('newmessage');
     }
 
-
     /**
      * Legend of the Form
      *
@@ -110,7 +109,6 @@ class MessageForm extends Form
         $this->out->element('legend', null, _('Send a direct notice'));
     }
 
-
     /**
      * Data elements
      *
@@ -134,20 +132,14 @@ class MessageForm extends Form
         $mutual_users->free();
         unset($mutual_users);
 
-        $this->out->elementStart('ul', 'form_data');
-        $this->out->elementStart('li', array('id' => 'notice_to'));
         $this->out->dropdown('to', _('To'), $mutual, null, false,
-                             $this->to->id);
-        $this->out->elementEnd('li');
+                             ($this->to) ? $this->to->id : null);
 
-        $this->out->elementStart('li', array('id' => 'notice_text'));
         $this->out->element('textarea', array('id' => 'notice_data-text',
                                               'cols' => 35,
                                               'rows' => 4,
                                               'name' => 'content'),
                             ($this->content) ? $this->content : '');
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
     }
 
     /**
@@ -158,14 +150,10 @@ class MessageForm extends Form
 
     function formActions()
     {
-        $this->out->elementStart('ul', 'form_actions');
-        $this->out->elementStart('li', array('id' => 'notice_submit'));
         $this->out->element('input', array('id' => 'notice_action-submit',
                                            'class' => 'submit',
                                            'name' => 'message_send',
                                            'type' => 'submit',
                                            'value' => _('Send')));
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
     }
 }