GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't get crud for Notice::repeatStream()

Browse Source
This commit is contained in:
Evan Prodromou 2011-07-14 12:53:18 -04:00
parent 9ab0a6f760
commit e48ca92914
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
classes/Notice.php
View File

@ -1861,7 +1861,11 @@ class Notice extends Memcached_DataObject
} else { } else {
$idstr = $cache->get(Cache::key('notice:repeats:'.$this->id)); $idstr = $cache->get(Cache::key('notice:repeats:'.$this->id));
if ($idstr !== false) { if ($idstr !== false) {
$ids = explode(',', $idstr); if (empty($idstr)) {
$ids = array();
} else {
$ids = explode(',', $idstr);
}
} else { } else {
$ids = $this->_repeatStreamDirect(100); $ids = $this->_repeatStreamDirect(100);
$cache->set(Cache::key('notice:repeats:'.$this->id), implode(',', $ids)); $cache->set(Cache::key('notice:repeats:'.$this->id), implode(',', $ids));
@ -1890,18 +1894,7 @@ class Notice extends Memcached_DataObject
$notice->limit(0, $limit); $notice->limit(0, $limit);
} }
$ids = array(); return $notice->fetchAll('id');
if ($notice->find()) {
while ($notice->fetch()) {
$ids[] = $notice->id;
}
}
$notice->free();
$notice = NULL;
return $ids;
} }
function locationOptions($lat, $lon, $location_id, $location_ns, $profile = null) function locationOptions($lat, $lon, $location_id, $location_ns, $profile = null)