summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-09 12:09:44 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-09 12:09:44 -0500
commitc87a0c3f58d12f778fbb3e762d058aa28c382ef0 (patch)
tree6ab7f63e8b9cf8e6738612a43f4727518454c65d
parent9b7c57d094ef5fc52a8a2c4ac6b7a89b1c221c54 (diff)
parent43888b523919f816e45a956a2e9f7d10416067df (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
-rw-r--r--actions/newmessage.php2
-rw-r--r--lib/htmloutputter.php2
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);