From f5f9559a6041e5f52596155308ba09d87e0c7973 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 28 Sep 2008 13:43:16 -0400
Subject: [PATCH] correct some SQL and add some spaces

darcs-hash:20080928174316-5ed1f-73bc071fed0aff359c94b4213816e8830eba6c50.gz
---
 classes/Notice.php | 6 +++---
 classes/User.php   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 76d6d801e4..cbd952767c 100644
--- 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 4ff8869571..4242d01091 100644
--- 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,