summaryrefslogtreecommitdiff
path: root/modules/comment
diff options
context:
space:
mode:
Diffstat (limited to 'modules/comment')
-rw-r--r--modules/comment/comment.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 5e1e3e4b4..3b230fe6d 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1972,10 +1972,10 @@ function _comment_get_display_setting($setting) {
}
else {
// otherwise use the user's setting if set
- if ($user->$setting) {
+ if (isset($user->$setting) && $user->$setting) {
$value = $user->$setting;
}
- else if ($_SESSION['comment_'. $setting]) {
+ else if (isset($_SESSION['comment_'. $setting]) && $_SESSION['comment_'. $setting]) {
$value = $_SESSION['comment_'. $setting];
}
else {