Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.453
diff -p -u -r1.453 comment.module
--- modules/comment.module	20 Apr 2006 07:11:37 -0000	1.453
+++ modules/comment.module	23 Apr 2006 16:33:34 -0000
@@ -710,12 +710,12 @@ function comment_render($node, $cid = 0)
       $nid = 0;
     }
 
-    if (empty($mode)) {
-      $mode = $user->mode ? $user->mode : ($_SESSION['comment_mode'] ? $_SESSION['comment_mode'] : variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED));
+    if (!isset($mode)) {
+      $mode = isset($user->mode) ? $user->mode : (isset($_SESSION['comment_mode']) ? $_SESSION['comment_mode'] : variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED));
     }
 
-    if (empty($order)) {
-      $order = $user->sort ? $user->sort : ($_SESSION['comment_sort'] ? $_SESSION['comment_sort'] : variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST));
+    if (!isset($order)) {
+      $order = isset($user->sort) ? $user->sort : (isset($_SESSION['comment_sort']) ? $_SESSION['comment_sort'] : variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST));
     }
 
     if (empty($comments_per_page)) {