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

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz

1 files changed, 8 insertions, 1 deletions

diff --git a/actions/newnotice.php b/actions/newnotice.php
index de8e9ec27..107665fb7 100644
--- 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);