From bdd0091e7077e09f1c8eb5dfc2b6e6ff2aa1fb8c Mon Sep 17 00:00:00 2001
From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Sun, 13 Jul 2008 02:50:09 -0400
Subject: [PATCH] Sort notices by date then id so they are in the correct order
 when there are multiple in the same second

darcs-hash:20080713065009-533db-69d7f21d152552d7e994a0c7c7615b61a8ea592c.gz
---
 actions/all.php             | 2 +-
 actions/allrss.php          | 2 +-
 actions/noticesearchrss.php | 2 +-
 actions/publicrss.php       | 2 +-
 actions/showstream.php      | 2 +-
 actions/userrss.php         | 2 +-
 classes/Profile.php         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index ae21b81ee6..20aea76686 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 86d98284eb..26e3f5241e 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 4e206c9a25..c9d08ce8e7 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 0916da0091..621058d3fe 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 88a8a90ca3..8980b4de15 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 89fe0efb26..2ae45dc9cd 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 dba7ca8a50..d482e8d283 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;