Merge branch 'testing' of git@gitorious.org:laconica/mainline into testing
This commit is contained in:
commit
900943f027
@ -732,6 +732,10 @@ class Notice extends Memcached_DataObject
|
|||||||
return new ArrayWrapper($notices);
|
return new ArrayWrapper($notices);
|
||||||
} else {
|
} else {
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
|
if (empty($ids)) {
|
||||||
|
//if no IDs requested, just return the notice object
|
||||||
|
return $notice;
|
||||||
|
}
|
||||||
$notice->whereAdd('id in (' . implode(', ', $ids) . ')');
|
$notice->whereAdd('id in (' . implode(', ', $ids) . ')');
|
||||||
$notice->orderBy('id DESC');
|
$notice->orderBy('id DESC');
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user