Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / actions / photo.php

diff --git a/plugins/GNUsocialPhotos/actions/photo.php b/plugins/GNUsocialPhotos/actions/photo.php
index 6e807b4ccc90b67f248f91b649214b95e4d51bcc..ecd64919c598c3fd0593cb863708d7da76b1dd96 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/photo.php
+++ b/plugins/GNUsocialPhotos/actions/photo.php
@@ -92,7 +92,7 @@ class PhotoAction extends ManagedAction
         $this->element('style', array(), "#notice-{$this->photo->notice_id} div { display: none } #notice-{$this->photo->notice_id} ol li div { display: inline }");
 
         if (Event::handle('StartShowConversation', array($this, $this->conv, $this->scoped))) {
-            $notices = $this->conv->getNotices();
+            $notices = $this->conv->getNotices($this->scoped);
             $nl = new FullThreadedNoticeList($notices, $this, $this->scoped);
             $cnt = $nl->show();
         }