From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 8 Mar 2015 23:16:58 +0000 (+0100)
Subject: Make CommentResponseImporter consistent w/ 30/5
X-Git-Tag: 2.1.2~69
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18b026a002afafcd35a6a2c3d862cc5fc3a53207;p=GitHub%2FWoltLab%2FWCF.git

Make CommentResponseImporter consistent w/ 30/5

see 9d007b407fca905603affe5c31ff98d2cbdf6764
---

diff --git a/wcfsetup/install/files/acp/rebuild_comments_com.woltlab.wcf_2.1.php b/wcfsetup/install/files/acp/rebuild_comments_com.woltlab.wcf_2.1.php
index e434259181..b764032cea 100644
--- a/wcfsetup/install/files/acp/rebuild_comments_com.woltlab.wcf_2.1.php
+++ b/wcfsetup/install/files/acp/rebuild_comments_com.woltlab.wcf_2.1.php
@@ -53,7 +53,7 @@ if ($rebuildData['max']) {
 		$sql = "SELECT		responseID
 			FROM		wcf".WCF_N."_comment_response
 			WHERE		commentID = ?
-			ORDER BY	time";
+			ORDER BY	time ASC, responseID ASC";
 		$statement = WCF::getDB()->prepareStatement($sql, 5);
 		
 		$commentData = array();
@@ -88,4 +88,3 @@ if ($rebuildData['max']) {
 		throw new SplitNodeException();
 	}
 }
-
diff --git a/wcfsetup/install/files/lib/data/comment/CommentEditor.class.php b/wcfsetup/install/files/lib/data/comment/CommentEditor.class.php
index c4c6a57493..2a581f8f7e 100644
--- a/wcfsetup/install/files/lib/data/comment/CommentEditor.class.php
+++ b/wcfsetup/install/files/lib/data/comment/CommentEditor.class.php
@@ -26,7 +26,7 @@ class CommentEditor extends DatabaseObjectEditor {
 		$sql = "SELECT		responseID
 			FROM		wcf".WCF_N."_comment_response
 			WHERE		commentID = ?
-			ORDER BY	time ASC";
+			ORDER BY	time ASC, responseID ASC";
 		$statement = WCF::getDB()->prepareStatement($sql, 5);
 		$statement->execute(array($this->commentID));
 		$responseIDs = array();
diff --git a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
index 869ba295ce..86ae1a002f 100644
--- a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
@@ -39,8 +39,8 @@ class AbstractCommentResponseImporter extends AbstractImporter {
 		$sql = "SELECT		responseID
 			FROM		wcf".WCF_N."_comment_response
 			WHERE		commentID = ?
-			ORDER BY	responseID ASC";
-		$statement = WCF::getDB()->prepareStatement($sql, 3);
+			ORDER BY	time ASC, responseID ASC";
+		$statement = WCF::getDB()->prepareStatement($sql, 5);
 		$statement->execute(array($response->commentID));
 		$responseIDs = array();
 		while ($responseID = $statement->fetchColumn()) $responseIDs[] = $responseID;