diff options
| -rw-r--r-- | actions/all.php | 2 | ||||
| -rw-r--r-- | actions/allrss.php | 2 | ||||
| -rw-r--r-- | actions/noticesearchrss.php | 2 | ||||
| -rw-r--r-- | actions/publicrss.php | 2 | ||||
| -rw-r--r-- | actions/showstream.php | 2 | ||||
| -rw-r--r-- | actions/userrss.php | 2 | ||||
| -rw-r--r-- | classes/Profile.php | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/actions/all.php b/actions/all.php index ae21b81ee..20aea7668 100644 --- a/actions/all.php +++ b/actions/all.php @@ -80,7 +80,7 @@ class AllAction extends StreamAction { $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR'); $notice->whereAdd('profile_id = ' . $profile->id, 'OR'); - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; diff --git a/actions/allrss.php b/actions/allrss.php index 86d98284e..26e3f5241 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -49,7 +49,7 @@ class AllrssAction extends Rss10Action { $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR'); $notice->whereAdd('profile_id = ' . $user->id, 'OR'); - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); if ($limit != 0) { $notice->limit(0, $limit); } diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php index 4e206c9a2..c9d08ce8e 100644 --- a/actions/noticesearchrss.php +++ b/actions/noticesearchrss.php @@ -40,7 +40,7 @@ class NoticesearchrssAction extends Rss10Action { $q = strtolower($q); $notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')'); - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); # Ask for an extra to see if there's more. diff --git a/actions/publicrss.php b/actions/publicrss.php index 0916da009..621058d3f 100644 --- a/actions/publicrss.php +++ b/actions/publicrss.php @@ -40,7 +40,7 @@ class PublicrssAction extends Rss10Action { $notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)'); - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); if ($limit != 0) { $notice->limit(0, $limit); diff --git a/actions/showstream.php b/actions/showstream.php index 88a8a90ca..8980b4de1 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -306,7 +306,7 @@ class ShowstreamAction extends StreamAction { $notice = DB_DataObject::factory('notice'); $notice->profile_id = $profile->id; - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; diff --git a/actions/userrss.php b/actions/userrss.php index 89fe0efb2..2ae45dc9c 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -46,7 +46,7 @@ class UserrssAction extends Rss10Action { $notice = DB_DataObject::factory('notice'); $notice->profile_id = $user->id; # user id === profile id - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); if ($limit != 0) { $notice->limit(0, $limit); } diff --git a/classes/Profile.php b/classes/Profile.php index dba7ca8a5..d482e8d28 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -145,7 +145,7 @@ class Profile extends DB_DataObject if ($dt) { $notice->whereAdd('created < "' . $dt . '"'); } - $notice->orderBy('created DESC'); + $notice->orderBy('created DESC, notice.id DESC'); $notice->limit(1); if ($notice->find(true)) { return $notice; |