diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-01-23 01:20:00 -0800 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-01-23 01:20:00 -0800 |
| commit | 0ef33663ce0b3739e8e9eb3b9951dee5059c6b3b (patch) | |
| tree | 179a9aaa7f7828489e93fca86ceeaa01b4d270a2 /classes/User.php | |
| parent | b13374faa568e4e77478b9ffe5c800758ffdc3f3 (diff) | |
| parent | 6b5fb0ab7d8c2e982052a48270e882e7f7379743 (diff) | |
Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php index 5f4fb9b6f..b1bae8835 100644 --- a/classes/User.php +++ b/classes/User.php @@ -403,7 +403,7 @@ class User extends Memcached_DataObject 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . 'WHERE notice_inbox.user_id = %d '; # NOTE: we override ORDER - $order = 'ORDER BY notice_inbox.created DESC, notice_inbox.notice_id DESC '; + $order = null; } return Notice::getStream(sprintf($qry, $this->id), 'user:notices_with_friends:' . $this->id, |