Misses this file to merge. I like the comments.

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

diff --git a/lib/filenoticestream.php b/lib/filenoticestream.php
index 8c01893634d55fe030a3a6dced098c73ca8b6d1e..f7bca1ed68e52ec1e7092e62c2267a65002cffad 100644 (file)
--- a/lib/filenoticestream.php
+++ b/lib/filenoticestream.php
@@ -36,10 +36,14 @@ if (!defined('STATUSNET')) {
 
 class FileNoticeStream extends ScopingNoticeStream
 {
-    function __construct($file)
+    function __construct($file, $profile = -1)
     {
+        if (is_int($profile) && $profile == -1) {
+            $profile = Profile::current();
+        }
         parent::__construct(new CachingNoticeStream(new RawFileNoticeStream($file),
-                                                    'file:notice-ids:'.$this->url));
+                                                    'file:notice-ids:'.$file->id),
+                            $profile);
     }
 }
 
@@ -60,7 +64,6 @@ class RawFileNoticeStream extends NoticeStream
 
     function __construct($file)
     {
-        parent::__construct();
         $this->file = $file;
     }