Merge conflicts and kill a whole lot of trailing whitespace on lines.

[quix0rs-gnu-social.git] / actions / newnotice.php

diff --git a/actions/newnotice.php b/actions/newnotice.php
index de8e9ec2783d2510ab53bdabaaf41b240aaf20cc..107665fb79d90719c40ec9782b2e658f4670c8a9 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -90,7 +90,14 @@ class NewnoticeAction extends Action {
 
        function show_form($msg=NULL) {
                $content = $this->trimmed('status_textarea');
-               common_show_header(_t('New notice'), NULL, $content,
+               if (!$content) {
+                       $replyto = $this->trimmed('replyto');
+                       $profile = Profile::staticGet('nickname', $replyto);
+                       if ($profile) {
+                               $content = '@' . $profile->nickname . ' ';
+                       }
+               }
+               common_show_header(_('New notice'), NULL, $content,
                                   array($this, 'show_top'));
                if ($msg) {
                        common_element('p', 'error', $msg);