diff options
| -rw-r--r-- | actions/newnotice.php | 3 | ||||
| -rw-r--r-- | actions/postnotice.php | 1 | ||||
| -rwxr-xr-x | maildaemon.php | 1 | ||||
| -rwxr-xr-x | xmppdaemon.php | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php index a98829cd8..bf5fd5bcc 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -38,9 +38,10 @@ 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'); diff --git a/actions/postnotice.php b/actions/postnotice.php index c86e095ff..ab12277bb 100644 --- a/actions/postnotice.php +++ b/actions/postnotice.php @@ -75,6 +75,7 @@ class PostnoticeAction extends Action { $notice = Notice::staticGet('uri', $notice_uri); if (!$notice) { $notice = new Notice(); + $notice->is_local = 0; $notice->profile_id = $remote_profile->id; $notice->uri = $notice_uri; $notice->content = $content; diff --git a/maildaemon.php b/maildaemon.php index f6de49d8d..f8fd7c11a 100755 --- a/maildaemon.php +++ b/maildaemon.php @@ -116,6 +116,7 @@ class MailerDaemon { function add_notice($user, $msg) { $notice = new Notice(); + $notice->is_local = 1; $notice->profile_id = $user->id; $notice->content = trim(substr($msg, 0, 140)); $notice->rendered = common_render_content($notice->content, $notice); diff --git a/xmppdaemon.php b/xmppdaemon.php index 9389e6fc9..d2e609b44 100755 --- a/xmppdaemon.php +++ b/xmppdaemon.php @@ -224,6 +224,7 @@ class XMPPDaemon { function add_notice(&$user, &$pl) { $notice = new Notice(); + $notice->is_local = 1; $notice->profile_id = $user->id; $notice->content = trim(substr($pl['body'], 0, 140)); $notice->rendered = common_render_content($notice->content, $notice); |