Merge branch 'master' of /var/www/mublog

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 5f4fb9b6fb057e4eddeabfef4e6209e3d524a89c..b1bae88351ad82a3f5b78b0de587aa9e3c3eeb78 100644 (file)
--- 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,