diff options
author | Evan Prodromou <evan@status.net> | 2010-01-18 23:26:03 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-18 23:26:03 -0500 |
commit | 42a47a771954c11525cda1c93ec55f53b8d33c93 (patch) | |
tree | 70e30e9e7287efbd6f16745df7f3fa7638338e69 /classes | |
parent | 71f519f64aed1dd6823a0f09db5c4c2e409da778 (diff) | |
parent | 775c63b654dacf733e7bef99cb9f6f07aa824854 (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'classes')
-rw-r--r-- | classes/Notice.php | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index a43ce867b..38b10db04 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -826,6 +826,10 @@ class Notice extends Memcached_DataObject return $ids; } + /** + * @param $groups array of Group *objects* + * @param $recipients array of profile *ids* + */ function whoGets($groups=null, $recipients=null) { $c = self::memcache(); @@ -925,6 +929,9 @@ class Notice extends Memcached_DataObject return $ids; } + /** + * @return array of Group objects + */ function saveGroups() { // Don't save groups for repeats @@ -1117,11 +1124,22 @@ class Notice extends Memcached_DataObject return $ids; } + /** + * Same calculation as saveGroups but without the saving + * @fixme merge the functions + * @return array of Group objects + */ function getGroups() { + // Don't save groups for repeats + + if (!empty($this->repeat_of)) { + return array(); + } + // XXX: cache me - $ids = array(); + $groups = array(); $gi = new Group_inbox(); @@ -1132,13 +1150,13 @@ class Notice extends Memcached_DataObject if ($gi->find()) { while ($gi->fetch()) { - $ids[] = $gi->group_id; + $groups[] = clone($gi); } } $gi->free(); - return $ids; + return $groups; } function asAtomEntry($namespace=false, $source=false) |