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

2 files changed, 2 insertions, 2 deletions

diff --git a/actions/newmessage.php b/actions/newmessage.php
index f83015a37..82276ff34 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -201,7 +201,7 @@ class NewmessageAction extends Action
 
     function showNoticeForm()
     {
-        $message_form = new MessageForm($this, $this->to, $this->content);
+        $message_form = new MessageForm($this, $this->other, $this->content);
         $message_form->show();
     }
 }
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 7780b1c19..e2319b1fd 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -255,7 +255,7 @@ class HTMLOutputter extends XMLOutputter
         foreach ($content as $value => $option) {
             if ($value == $selected) {
                 $this->element('option', array('value' => $value,
-                                               'selected' => $value),
+                                               'selected' => 'selected'),
                                $option);
             } else {
                 $this->element('option', array('value' => $value), $option);