Merge remote branch 'gitorious/1.0.x' into 1.0.x

1 files changed, 2 insertions, 2 deletions

diff --git a/classes/User.php b/classes/User.php
index 4626a7ca1..314b80531 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -459,9 +459,9 @@ class User extends Memcached_DataObject
         return $profile->getNotices($offset, $limit, $since_id, $before_id);
     }
 
-    function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false)
+    function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
     {
-        $ids = Fave::stream($this->id, $offset, $limit, $own);
+        $ids = Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id);
         return Notice::getStreamByIds($ids);
     }