summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-25 11:18:56 -0400
committerEvan Prodromou <evan@status.net>2010-10-25 11:18:56 -0400
commitb60b9b4fa2863a398291706350b3f68f725f7687 (patch)
tree725541271809beec39c8248df9399288b6aefd95
parent75fcf1e081f1a8022094410a9f379a55753a139c (diff)
parentaef88c7ceeb219c12d4ebce65b6f1fbccbc1458a (diff)
Merge branch '0.9.x' into atompub
-rw-r--r--classes/Notice_tag.php2
-rw-r--r--classes/Profile.php2
-rw-r--r--classes/Reply.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index a5d0716a7..6eada7022 100644
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -60,7 +60,7 @@ class Notice_tag extends Memcached_DataObject
}
if ($max_id != 0) {
- $nt->whereAdd('notice_id < ' . $max_id);
+ $nt->whereAdd('notice_id <= ' . $max_id);
}
$nt->orderBy('notice_id DESC');
diff --git a/classes/Profile.php b/classes/Profile.php
index a359a02d9..37d2c571f 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -240,7 +240,7 @@ class Profile extends Memcached_DataObject
}
if ($max_id != 0) {
- $query .= " and id < $max_id";
+ $query .= " and id <= $max_id";
}
$query .= ' order by id DESC';
diff --git a/classes/Reply.php b/classes/Reply.php
index dc6296bda..da8a4f685 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -55,7 +55,7 @@ class Reply extends Memcached_DataObject
}
if ($max_id != 0) {
- $reply->whereAdd('notice_id < ' . $max_id);
+ $reply->whereAdd('notice_id <= ' . $max_id);
}
$reply->orderBy('notice_id DESC');