Merge from 1.0.x

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

diff --git a/classes/Group_member.php b/classes/Group_member.php
index 2ad6589a3c555313e35364e32d070f7888928477..8873942318b04329512c6b5c8c184ab9365e5e59 100644 (file)
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -45,6 +45,8 @@ class Group_member extends Managed_DataObject
                 // @fixme probably we want a (profile_id, created) index here?
                 'group_member_profile_id_idx' => array('profile_id'),
                 'group_member_created_idx' => array('created'),
+                'group_member_profile_id_created_idx' => array('profile_id', 'created'),
+                'group_member_group_id_created_idx' => array('group_id', 'created'),
             ),
         );
     }
@@ -203,14 +205,14 @@ class Group_member extends Managed_DataObject
         if (!empty($this->uri)) {
             return $this->uri;
         } else {
-            return self::newURI($this->member_id, $this->group_id, $this->created);
+            return self::newURI($this->profile_id, $this->group_id, $this->created);
         }
     }
 
-    static function newURI($member_id, $group_id, $created)
+    static function newURI($profile_id, $group_id, $created)
     {
         return TagURI::mint('join:%d:%d:%s',
-                            $member_id,
+                            $profile_id,
                             $group_id,
                             common_date_iso8601($created));
     }