diff options
author | Evan Prodromou <evan@status.net> | 2009-09-24 17:22:51 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-09-24 17:22:51 -0400 |
commit | 78cec7ab87c005e988dbd8176585ffad9182d25c (patch) | |
tree | 735c4755433140939e6b841f971a273c6a2f76f8 /lib/noticeform.php | |
parent | 8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (diff) | |
parent | 49bce941a9aae495ee7221bd367791227487b458 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
install.php
lib/noticeform.php
Diffstat (limited to 'lib/noticeform.php')
-rw-r--r-- | lib/noticeform.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/noticeform.php b/lib/noticeform.php index ce8f9c653..186330bf1 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -90,7 +90,7 @@ class NoticeForm extends Form $this->action = $action; $this->content = $content; $this->inreplyto = $inreplyto; - + if ($user) { $this->user = $user; } else { |