correct some SQL and add some spaces

darcs-hash:20080928174316-5ed1f-73bc071fed0aff359c94b4213816e8830eba6c50.gz

diff --git a/classes/Notice.php b/classes/Notice.php
index 76d6d801e449319dc90e674e3f47bd1f4b653419..cbd952767ce4b5d8599df9fc2661722b14825636 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -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();

diff --git a/classes/User.php b/classes/User.php
index 4ff8869571c676f7949370821205087a2f37a386..4242d0109192bfda403b838c55638f1564414ec7 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -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,