X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=6d98c820cc46d4f8b40ef7d8376ea354175528a6;hb=d3679822530e351894ca1f809c97638873832a74;hp=535b1a512dde8fd72d3274cb31b64693c211d303;hpb=55fdd0b981c0a429186eda6f8d95b06f67eade76;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 535b1a512d..6d98c820cc 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -43,7 +43,7 @@ class NewnoticeAction extends Action {
 		$notice->profile_id = $user->id; # user id *is* profile id
 		$notice->created = DB_DataObject_Cast::dateTime();
 		# Default theme uses 'content' for something else
-		$notice->content = $this->trimmed('noticecontent');
+		$notice->content = $this->trimmed('status_textarea');
 
 		if (!$notice->content) {
 			$this->show_form(_t('No content!'));
@@ -55,21 +55,40 @@ class NewnoticeAction extends Action {
 
 		$id = $notice->insert();
 		
-		if ($id) {
-			common_broadcast_notices($id);
-			common_redirect(common_local_url('shownotice',
-											 array('notice' => $id)), 303);
-		} else {
+		if (!$id) {
 			common_server_error(_t('Problem saving notice.'));
+			return;
+		}
+
+		$orig = clone($notice);
+		$notice->uri = common_notice_uri($notice);
+		
+		if (!$notice->update($orig)) {
+			common_server_error(_t('Problem saving notice.'));
+			return;
 		}
+		
+		common_broadcast_notice($notice);
+		$returnto = $this->trimmed('returnto');
+		if ($returnto) {
+			$url = common_local_url($returnto,
+									array('nickname' => $user->nickname));
+		} else {
+			$url = common_local_url('shownotice',
+									array('notice' => $id));
+		}
+		common_redirect($url, 303);
 	}
 
-	function show_form($msg=NULL) {
-		common_show_header(_t('New notice'));
+	function show_top($msg=NULL) {
 		if ($msg) {
 			common_element('div', 'error', $msg);
 		}
+	}
+	
+	function show_form($msg=NULL) {
+		common_show_header(_t('New notice'), NULL, $msg, array($this, 'show_top'));
 		common_notice_form();
 		common_show_footer();
 	}
-}
\ No newline at end of file
+}