Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.617.2.17
diff -u -r1.617.2.17 comment.module
--- modules/comment/comment.module	11 Aug 2010 20:35:47 -0000	1.617.2.17
+++ modules/comment/comment.module	8 Jan 2011 08:26:28 -0000
@@ -968,7 +968,7 @@
 
       if ($order == COMMENT_ORDER_NEWEST_FIRST) {
         if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {
-          $query .= ' ORDER BY c.cid DESC';
+          $query .= ' ORDER BY c.timestamp DESC';
         }
         else {
           $query .= ' ORDER BY c.thread DESC';
@@ -976,7 +976,7 @@
       }
       else if ($order == COMMENT_ORDER_OLDEST_FIRST) {
         if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {
-          $query .= ' ORDER BY c.cid';
+          $query .= ' ORDER BY c.timestamp';
         }
         else {
           // See comment above. Analysis reveals that this doesn't cost too