Merge branch 'master' into social-master

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

diff --git a/lib/peopletagnoticestream.php b/lib/peopletagnoticestream.php
index f90255b111c195dc654c307226373a87bbf3f340..4422261ae9a6950881d7823ea1c1190b1123a894 100644 (file)
--- a/lib/peopletagnoticestream.php
+++ b/lib/peopletagnoticestream.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Stream of notices for a people tag
+ * Stream of notices for a list
  *
  * PHP version 5
  *
@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Stream of notices for a people tag
+ * Stream of notices for a list
  *
  * @category  Stream
  * @package   StatusNet
@@ -59,7 +59,7 @@ class PeopletagNoticeStream extends ScopingNoticeStream
 }
 
 /**
- * Stream of notices for a people tag
+ * Stream of notices for a list
  *
  * @category  Stream
  * @package   StatusNet
@@ -99,7 +99,9 @@ class RawPeopletagNoticeStream extends NoticeStream
         $ptag = new Profile_tag();
         $ptag->tag    = $this->profile_list->tag;
         $ptag->tagger = $this->profile_list->tagger;
-        $notice->joinAdd($ptag);
+        $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));
 
         if ($since_id != 0) {
             $notice->whereAdd('notice.id > ' . $since_id);