eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correct some SQL and add some spaces 

darcs-hash:20080928174316-5ed1f-73bc071fed0aff359c94b4213816e8830eba6c50.gz
This commit is contained in:
Evan Prodromou 2008-09-28 13:43:16 -04:00
parent 4bea5b60a0
commit f5f9559a60
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Notice.php
View File

@ -220,12 +220,12 @@ class Notice extends Memcached_DataObject
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') {
$qry .= 'LIMIT ' . $limit . ' OFFSET ' . $offset;
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= 'LIMIT ' . $offset . ', ' . $limit;
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
$notice = new Notice();

4
classes/User.php
View File

@ -344,7 +344,7 @@ class User extends Memcached_DataObject
$qry =
'SELECT notice.* ' .
'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),
'user:faves:'.$this->id,
@ -355,7 +355,7 @@ class User extends Memcached_DataObject
$qry =
'SELECT notice.* ' .
'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),
'user:notices_with_friends:' . $this->id,