Misses this file to merge. I like the comments.

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

diff --git a/lib/taggedprofilenoticestream.php b/lib/taggedprofilenoticestream.php
index 83c304ed8ffedce35d2797e9f2b53014b56b35f1..eec20cd8c660153f209ba1c518adc05d7da0fe95 100644 (file)
--- a/lib/taggedprofilenoticestream.php
+++ b/lib/taggedprofilenoticestream.php
@@ -47,10 +47,14 @@ if (!defined('STATUSNET')) {
 
 class TaggedProfileNoticeStream extends ScopingNoticeStream
 {
-    function __construct($profile, $tag)
+    function __construct($profile, $tag, $userProfile=-1)
     {
+        if (is_int($userProfile) && $userProfile == -1) {
+            $userProfile = Profile::current();
+        }
         parent::__construct(new CachingNoticeStream(new RawTaggedProfileNoticeStream($profile, $tag),
-                                                    'profile:notice_ids_tagged:'.$profile->id.':'.Cache::keyize($tag)));
+                                                    'profile:notice_ids_tagged:'.$profile->id.':'.Cache::keyize($tag)),
+                            $userProfile);
     }
 }