X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=cc40f89bc137a519843858e7fdc20f659447d0b0;hb=9b741c4f9a211906f18b8aee7fe7cee58f911403;hp=5f6a224848d2baa976de75aa97f0900dbb5629c8;hpb=5d84485001ace75c49cdc295b4ed3540db83e988;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 5f6a224848..cc40f89bc1 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -38,50 +38,35 @@ class NewnoticeAction extends Action {
 
 		$user = common_current_user();
 		assert($user); # XXX: maybe an error instead...
-		$notice = new Notice();
-		assert($notice);
-		$notice->profile_id = $user->id; # user id *is* profile id
-		$notice->is_local = 1;
-		$notice->created = DB_DataObject_Cast::dateTime();
-		# Default theme uses 'content' for something else
-		$notice->content = $this->trimmed('status_textarea');
-
-		if (!$notice->content) {
+		$content = $this->trimmed('status_textarea');
+		
+		if (!$content) {
 			$this->show_form(_('No content!'));
 			return;
-		} else if (strlen($notice->content) > 140) {
+		} else if (mb_strlen($content) > 140) {
+			common_debug("Content = '$content'", __FILE__);
+			common_debug("mb_strlen(\$content) = " . mb_strlen($content), __FILE__);
 			$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(_('Problem saving notice.'));
+		$notice = Notice::saveNew($user->id, $content, 'web');
+		
+		if (is_string($notice)) {
+			$this->show_form($notice);
 			return;
 		}
-
-		$orig = clone($notice);
-		$notice->uri = common_notice_uri($notice);
-
-		if (!$notice->update($orig)) {
-			common_server_error(_('Problem saving notice.'));
-			return;
-		}
-
-		common_save_replies($notice);
-		$notice->saveTags();
+		
 		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));
+									array('notice' => $notice->id));
 		}
 		common_redirect($url, 303);
 	}