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 e4342591810e555f40c2d2d720f5b7903bd77853..b764032cea954fa7f89282603674fd5a010fb75f 100644 (file)
--- 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 c4c6a57493f100f8a23d0fcce365e8c53e9bc529..2a581f8f7e648de90e6eb0ea2c35721852a99857 100644 (file)
--- 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 869ba295ce0104ffc40190468621ab8660eae908..86ae1a002f4f678917b4b3732ef7c7250f824ac6 100644 (file)
--- 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;