correct some SQL and add some spaces
darcs-hash:20080928174316-5ed1f-73bc071fed0aff359c94b4213816e8830eba6c50.gz
This commit is contained in:
parent
4bea5b60a0
commit
f5f9559a60
|
@ -220,12 +220,12 @@ class Notice extends Memcached_DataObject
|
||||||
|
|
||||||
static function getStreamDirect($qry, $offset, $limit) {
|
static function getStreamDirect($qry, $offset, $limit) {
|
||||||
|
|
||||||
$qry .= 'ORDER BY notice.created DESC, notice.id DESC ';
|
$qry .= ' ORDER BY notice.created DESC, notice.id DESC ';
|
||||||
|
|
||||||
if(common_config('db','type')=='pgsql') {
|
if(common_config('db','type')=='pgsql') {
|
||||||
$qry .= 'LIMIT ' . $limit . ' OFFSET ' . $offset;
|
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
|
||||||
} else {
|
} else {
|
||||||
$qry .= 'LIMIT ' . $offset . ', ' . $limit;
|
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
|
|
|
@ -344,7 +344,7 @@ class User extends Memcached_DataObject
|
||||||
$qry =
|
$qry =
|
||||||
'SELECT notice.* ' .
|
'SELECT notice.* ' .
|
||||||
'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
|
'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
|
||||||
'WHERE fave.profile_id = %d ';
|
'WHERE fave.user_id = %d ';
|
||||||
|
|
||||||
return Notice::getStream(sprintf($qry, $this->id),
|
return Notice::getStream(sprintf($qry, $this->id),
|
||||||
'user:faves:'.$this->id,
|
'user:faves:'.$this->id,
|
||||||
|
@ -355,7 +355,7 @@ class User extends Memcached_DataObject
|
||||||
$qry =
|
$qry =
|
||||||
'SELECT notice.* ' .
|
'SELECT notice.* ' .
|
||||||
'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
|
'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
|
||||||
'WHERE subscription.subscriber = %d';
|
'WHERE subscription.subscriber = %d ';
|
||||||
|
|
||||||
return Notice::getStream(sprintf($qry, $this->id),
|
return Notice::getStream(sprintf($qry, $this->id),
|
||||||
'user:notices_with_friends:' . $this->id,
|
'user:notices_with_friends:' . $this->id,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user