Merge branch 'master' into social-master

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

diff --git a/lib/peopletagnoticestream.php b/lib/peopletagnoticestream.php
index e82d754e8d63e4da324630eac6facad37df8ad64..4422261ae9a6950881d7823ea1c1190b1123a894 100644 (file)
--- a/lib/peopletagnoticestream.php
+++ b/lib/peopletagnoticestream.php
@@ -96,10 +96,12 @@ class RawPeopletagNoticeStream extends NoticeStream
         $notice->selectAdd();
         $notice->selectAdd('notice.id');
 
+        $ptag = new Profile_tag();
+        $ptag->tag    = $this->profile_list->tag;
+        $ptag->tagger = $this->profile_list->tagger;
         $notice->joinAdd(array('profile_id', 'profile_tag:tagged'));
-
+        $notice->whereAdd('profile_tag.tagger = ' . $this->profile_list->tagger);
         $notice->whereAdd(sprintf('profile_tag.tag = "%s"', $this->profile_list->tag));
-        $notice->whereAdd(sprintf('profile_tag.tagger = %d', $this->profile_list->tagger));
 
         if ($since_id != 0) {
             $notice->whereAdd('notice.id > ' . $since_id);