Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.552
diff -u -r1.552 comment.module
--- modules/comment/comment.module	11 Jun 2007 14:56:40 -0000	1.552
+++ modules/comment/comment.module	13 Jun 2007 00:01:31 -0000
@@ -1951,36 +1951,31 @@
 function _comment_get_display_setting($setting) {
   global $user;
 
-  if (isset($_GET[$setting])) {
-    $value = $_GET[$setting];
+  // get the setting's site default
+  switch ($setting) {
+    case 'mode':
+      $default = variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED);
+      break;
+    case 'sort':
+      $default = variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST);
+      break;
+    case 'comments_per_page':
+      $default = variable_get('comment_default_per_page', '50');
+  }
+  if (variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_HIDDEN) {
+    // if comment controls are disabled use site default
+    $value = $default;
   }
   else {
-    // get the setting's site default
-    switch ($setting) {
-      case 'mode':
-        $default = variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED);
-        break;
-      case 'sort':
-        $default = variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST);
-        break;
-      case 'comments_per_page':
-        $default = variable_get('comment_default_per_page', '50');
+    // otherwise use the user's setting if set
+    if ($user->$setting) {
+      $value = $user->$setting;
     }
-    if (variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_HIDDEN) {
-      // if comment controls are disabled use site default
-      $value = $default;
+    else if ($_SESSION['comment_'. $setting]) {
+      $value = $_SESSION['comment_'. $setting];
     }
     else {
-      // otherwise use the user's setting if set
-      if ($user->$setting) {
-        $value = $user->$setting;
-      }
-      else if ($_SESSION['comment_'. $setting]) {
-        $value = $_SESSION['comment_'. $setting];
-      }
-      else {
-        $value = $default;
-      }
+      $value = $default;
     }
   }
   return $value;