We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit c87a0c3f authored by Evan Prodromou's avatar Evan Prodromou

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

parents 9b7c57d0 43888b52
...@@ -201,7 +201,7 @@ class NewmessageAction extends Action ...@@ -201,7 +201,7 @@ class NewmessageAction extends Action
function showNoticeForm() function showNoticeForm()
{ {
$message_form = new MessageForm($this, $this->to, $this->content); $message_form = new MessageForm($this, $this->other, $this->content);
$message_form->show(); $message_form->show();
} }
} }
...@@ -255,7 +255,7 @@ class HTMLOutputter extends XMLOutputter ...@@ -255,7 +255,7 @@ class HTMLOutputter extends XMLOutputter
foreach ($content as $value => $option) { foreach ($content as $value => $option) {
if ($value == $selected) { if ($value == $selected) {
$this->element('option', array('value' => $value, $this->element('option', array('value' => $value,
'selected' => $value), 'selected' => 'selected'),
$option); $option);
} else { } else {
$this->element('option', array('value' => $value), $option); $this->element('option', array('value' => $value), $option);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment