diff options
Diffstat (limited to 'modules/comment.module')
| -rw-r--r-- | modules/comment.module | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/comment.module b/modules/comment.module index 8a3db48b8..afaf5492f 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -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)) { |