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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index b2c513733d..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!'));
@@ -61,7 +61,7 @@ class NewnoticeAction extends Action {
 		}
 
 		$orig = clone($notice);
-		$notice->uri = common_mint_tag('notice:' . $id);
+		$notice->uri = common_notice_uri($notice);
 		
 		if (!$notice->update($orig)) {
 			common_server_error(_t('Problem saving notice.'));
@@ -69,16 +69,26 @@ class NewnoticeAction extends Action {
 		}
 		
 		common_broadcast_notice($notice);
-		common_redirect(common_local_url('shownotice',
-										 array('notice' => $id)), 303);
+		$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
+}