* tag i18n issue.

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

diff --git a/classes/User.php b/classes/User.php
index edbd6bb2e394ef3313080b9e66f06b5d927ad6a0..654ac8fb50051966db06f268f43bd1ccb2062e27 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -755,19 +755,14 @@ class User extends Memcached_DataObject
         $notice->profile_id = $this->id;
         $notice->whereAdd('repeat_of IS NOT NULL');
 
-        $notice->orderBy('id DESC');
+        $notice->orderBy('created DESC, id DESC');
 
         if (!is_null($offset)) {
             $notice->limit($offset, $limit);
         }
 
-        if ($since_id != 0) {
-            $notice->whereAdd('id > ' . $since_id);
-        }
-
-        if ($max_id != 0) {
-            $notice->whereAdd('id <= ' . $max_id);
-        }
+        Notice::addWhereSinceId($notice, $since_id);
+        Notice::addWhereMaxId($notice, $max_id);
 
         $ids = array();
 
@@ -980,7 +975,7 @@ class User extends Memcached_DataObject
     }
 
     /*
-     * Get a list of OAuth client application that have access to this
+     * Get a list of OAuth client applications that have access to this
      * user's account.
      */
     function getConnectedApps($offset = 0, $limit = null)