change NOTICE_GATEWAY to Notice::GATEWAY so autoloading works
This commit is contained in:
parent
6467351e32
commit
5f7fb99447
|
@ -59,7 +59,7 @@ class Fave extends Memcached_DataObject
|
|||
$qry = 'SELECT fave.* FROM fave ';
|
||||
$qry .= 'INNER JOIN notice ON fave.notice_id = notice.id ';
|
||||
$qry .= 'WHERE fave.user_id = ' . $user_id . ' ';
|
||||
$qry .= 'AND notice.is_local != ' . NOTICE_GATEWAY . ' ';
|
||||
$qry .= 'AND notice.is_local != ' . Notice::GATEWAY . ' ';
|
||||
}
|
||||
|
||||
if ($since_id != 0) {
|
||||
|
|
|
@ -32,7 +32,6 @@ define('NOTICE_CACHE_WINDOW', 61);
|
|||
define('NOTICE_LOCAL_PUBLIC', 1);
|
||||
define('NOTICE_REMOTE_OMB', 0);
|
||||
define('NOTICE_LOCAL_NONPUBLIC', -1);
|
||||
define('NOTICE_GATEWAY', -2);
|
||||
|
||||
define('MAX_BOXCARS', 128);
|
||||
|
||||
|
@ -63,6 +62,8 @@ class Notice extends Memcached_DataObject
|
|||
/* the code above is auto generated do not remove the tag below */
|
||||
###END_AUTOCODE
|
||||
|
||||
const GATEWAY = -2;
|
||||
|
||||
function getProfile()
|
||||
{
|
||||
return Profile::staticGet('id', $this->profile_id);
|
||||
|
|
|
@ -443,7 +443,7 @@ class User extends Memcached_DataObject
|
|||
'SELECT notice.* ' .
|
||||
'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
|
||||
'WHERE subscription.subscriber = %d ' .
|
||||
'AND notice.is_local != ' . NOTICE_GATEWAY;
|
||||
'AND notice.is_local != ' . Notice::GATEWAY;
|
||||
return Notice::getStream(sprintf($qry, $this->id),
|
||||
'user:notices_with_friends:' . $this->id,
|
||||
$offset, $limit, $since_id, $before_id,
|
||||
|
|
|
@ -317,7 +317,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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user