Don't override ORDER for inboxes; it messes up caching

diff --git a/classes/User.php b/classes/User.php
index 32d5bedde1b72b6430637c1311aa6c1d84aa485d..5dab5c7017c7398b81f10950f2e7fb33c3acea3f 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -385,8 +385,7 @@ class User extends Memcached_DataObject
                          'SELECT notice.* ' .
                          '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,