X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=a98829cd87f32d6005045289ee1bc6c4877c915a;hb=1cc71d0684360b0a7e6cf7bf966dd5ff7fcf5386;hp=64fe2494b8f11845675e086d364910e656e8c9a5;hpb=d34fc127a55301a08560d4c2b45bdf057e852432;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 64fe2494b8..a98829cd87 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -26,7 +26,7 @@ class NewnoticeAction extends Action {
 		# XXX: Ajax!
 
 		if (!common_logged_in()) {
-			common_user_error(_t('Not logged in.'));
+			common_user_error(_('Not logged in.'));
 		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$this->save_new_notice();
 		} else {
@@ -46,17 +46,19 @@ class NewnoticeAction extends Action {
 		$notice->content = $this->trimmed('status_textarea');
 
 		if (!$notice->content) {
-			$this->show_form(_t('No content!'));
+			$this->show_form(_('No content!'));
 			return;
 		} else if (strlen($notice->content) > 140) {
-			$this->show_form(_t('That\'s too long. Max notice size is 140 chars.'));
+			$this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
 			return;
 		}
 
+		$notice->rendered = common_render_content($notice->content, $notice);
+
 		$id = $notice->insert();
 
 		if (!$id) {
-			common_server_error(_t('Problem saving notice.'));
+			common_server_error(_('Problem saving notice.'));
 			return;
 		}
 
@@ -64,11 +66,13 @@ class NewnoticeAction extends Action {
 		$notice->uri = common_notice_uri($notice);
 
 		if (!$notice->update($orig)) {
-			common_server_error(_t('Problem saving notice.'));
+			common_server_error(_('Problem saving notice.'));
 			return;
 		}
 
+        common_save_replies($notice);
 		common_broadcast_notice($notice);
+
 		$returnto = $this->trimmed('returnto');
 		if ($returnto) {
 			$url = common_local_url($returnto,
@@ -86,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);