Merge 1.1.x into master

[quix0rs-gnu-social.git] / classes / Profile.php

diff --git a/classes/Profile.php b/classes/Profile.php
index f0a326e21236735637be86f1e5978627a7199b2f..8a5be5f358b58916662310e25e341cb702d8e183 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -595,7 +595,7 @@ class Profile extends Managed_DataObject
             if (Event::handle('StartJoinGroup', array($group, $this))) {
                 $join = Group_member::join($group->id, $this->id);
                 self::blow('profile:groups:%d', $this->id);
-                self::blow('group:members:%d', $group->id);
+                self::blow('group:member_ids:%d', $group->id);
                 self::blow('group:member_count:%d', $group->id);
                 Event::handle('EndJoinGroup', array($group, $this));
             }
@@ -617,7 +617,7 @@ class Profile extends Managed_DataObject
         if (Event::handle('StartLeaveGroup', array($group, $this))) {
             Group_member::leave($group->id, $this->id);
             self::blow('profile:groups:%d', $this->id);
-            self::blow('group:members:%d', $group->id);
+            self::blow('group:member_ids:%d', $group->id);
             self::blow('group:member_count:%d', $group->id);
             Event::handle('EndLeaveGroup', array($group, $this));
         }
@@ -686,7 +686,7 @@ class Profile extends Managed_DataObject
         $profile = new Profile();
         $tagged = array();
 
-        $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $tag));
+        $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $profile->escape($tag)));
 
         while ($profile->fetch()) {
             $tagged[] = clone($profile);