summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-22 22:12:15 -0800
committerEvan Prodromou <evan@status.net>2009-12-22 22:12:15 -0800
commit185e229f7974c3bee2070ee7a2e4b8aaf01ee35e (patch)
tree547a74763fd17d7cfc6309c9e07d52b26c15f251 /classes/User.php
parenta2cb0a033fa6777d824dc40e759294287bd83939 (diff)
parent725b2d0475ba3d0dcfafd48a191b4ddee09cae68 (diff)
Merge branch 'master' into 0.9.x
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php
index ae709b46b..484dc8c82 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -543,7 +543,7 @@ class User extends Memcached_DataObject
// NOTE: we sort by fave time, not by notice time!
- $qry .= 'ORDER BY notice.id DESC ';
+ $qry .= 'ORDER BY notice_id DESC ';
if (!is_null($offset)) {
$qry .= "LIMIT $limit OFFSET $offset";