Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / lib / profilenoticestream.php

diff --git a/lib/profilenoticestream.php b/lib/profilenoticestream.php
index ca54ad4892b7eb81976b12e2d374048ad1f665d3..64cd31abc48d64f5d83276c5b2ea8db95b8d7d9b 100644 (file)
--- a/lib/profilenoticestream.php
+++ b/lib/profilenoticestream.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Stream of notices by a profile
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -47,10 +47,14 @@ if (!defined('STATUSNET')) {
 
 class ProfileNoticeStream extends ScopingNoticeStream
 {
-    function __construct($profile)
+    function __construct($profile, $userProfile = -1)
     {
+        if (is_int($userProfile) && $userProfile == -1) {
+            $userProfile = Profile::current();
+        }
         parent::__construct(new CachingNoticeStream(new RawProfileNoticeStream($profile),
-                                                    'profile:notice_ids:' . $profile->id));
+                                                    'profile:notice_ids:' . $profile->id),
+                            $userProfile);
     }
 }