From e115322473a0b9239e3ce3502fcdbe85fdf388d7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Sun, 5 Oct 2008 14:13:50 -0400
Subject: [PATCH] Fixed up conflict (over white space) in User.php

darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz
---
 classes/User.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/classes/User.php b/classes/User.php
index 25caf03585..ce7632ec5b 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -141,6 +141,19 @@ class User extends Memcached_DataObject
 		return true;
 	}
 
+	function noticesWithFriendsWindow() {
+		
+		
+		$notice = new Notice();
+		
+		$notice->query('SELECT notice.* ' .
+					   'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
+					   'WHERE subscription.subscriber = ' . $this->id . ' ' .
+					   'ORDER BY created DESC, notice.id DESC ' .
+					   'LIMIT 0, ' . WITHFRIENDS_CACHE_WINDOW);
+		
+	}
+	
 	static function register($fields) {
 
 		# MAGICALLY put fields into current scope