diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-23 14:45:21 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-23 14:45:21 -0700 |
commit | 749d9bfbbf65d962804bea1fa510039da185179f (patch) | |
tree | 6d49205a0e305ec66573f7b94329832932b52c5d /scripts/twitterstatusfetcher.php | |
parent | 0a602725b1c49d246e77b24c723a65cdb0119e8e (diff) | |
parent | 5f7fb994471e4326f6aea5e29157a6236de4001f (diff) |
Merge branch 'master' into 0.8.x
Conflicts:
scripts/twitterstatusfetcher.php
Diffstat (limited to 'scripts/twitterstatusfetcher.php')
-rwxr-xr-x | scripts/twitterstatusfetcher.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php index e2ba1d003..e1745cfc0 100755 --- a/scripts/twitterstatusfetcher.php +++ b/scripts/twitterstatusfetcher.php @@ -330,7 +330,7 @@ class TwitterStatusFetcher extends Daemon $notice->rendered = common_render_content($notice->content, $notice); $notice->source = 'twitter'; $notice->reply_to = null; // XXX lookup reply - $notice->is_local = NOTICE_GATEWAY; + $notice->is_local = Notice::GATEWAY; if (Event::handle('StartNoticeSave', array(&$notice))) { $id = $notice->insert(); |