relative info, too

[quix0rs-gnu-social.git] / actions / newnotice.php

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3abe875d5c046a10edf04283b6f2d1b2d517d674..5f6a224848d2baa976de75aa97f0900dbb5629c8 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -20,13 +20,13 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
-
+       
        function handle($args) {
                parent::handle($args);
                # 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 {
@@ -38,25 +38,28 @@ class NewnoticeAction extends Action {
 
                $user = common_current_user();
                assert($user); # XXX: maybe an error instead...
-               $notice = DB_DataObject::factory('notice');
+               $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) {
-                       $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,13 +67,14 @@ 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_save_replies($notice);
+               $notice->saveTags();
                common_broadcast_notice($notice);
-               
+
                $returnto = $this->trimmed('returnto');
                if ($returnto) {
                        $url = common_local_url($returnto,
@@ -95,7 +99,7 @@ class NewnoticeAction extends Action {
                                $content = '@' . $profile->nickname . ' ';
                        }
                }
-               common_show_header(_t('New notice'), NULL, $content,
+               common_show_header(_('New notice'), NULL, $content,
                                   array($this, 'show_top'));
                if ($msg) {
                        common_element('p', 'error', $msg);