Merge branch 'issue-326' into 'master'

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

diff --git a/lib/filenoticestream.php b/lib/filenoticestream.php
index 2b5e53eaf798a142fc777d70b428e19a3b343378..49b93732fbc091e253299df0fb47050ec24be820 100644 (file)
--- a/lib/filenoticestream.php
+++ b/lib/filenoticestream.php
@@ -28,18 +28,15 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 class FileNoticeStream extends ScopingNoticeStream
 {
-    function __construct($file)
+    function __construct($file, Profile $scoped=null)
     {
         parent::__construct(new CachingNoticeStream(new RawFileNoticeStream($file),
-                                                    'file:notice-ids:'.$this->url));
+                                                    'file:notice-ids:'.$file->id),
+                            $scoped);
     }
 }