summaryrefslogtreecommitdiff
path: root/classes/Notice.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-08-29 06:20:50 +0000
committerZach Copley <zach@controlyourself.ca>2009-08-29 06:20:50 +0000
commit87ae90c9037a6ff2fed2612a5d5e16707aa05b6e (patch)
treea2e1b86e1346afc55b33994ccd028616e26be66e /classes/Notice.php
parentc02e8a46878ba3ba1ea24f746db8ef0039d19612 (diff)
parenta44c064397bc7ec6f4aa5e91d8288cd57f79e34a (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'classes/Notice.php')
-rw-r--r--classes/Notice.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 28d5b8ddf..89afe9d1d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -732,6 +732,10 @@ class Notice extends Memcached_DataObject
return new ArrayWrapper($notices);
} else {
$notice = new Notice();
+ if (empty($ids)) {
+ //if no IDs requested, just return the notice object
+ return $notice;
+ }
$notice->whereAdd('id in (' . implode(', ', $ids) . ')');
$notice->orderBy('id DESC');