summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2010-04-14 20:46:53 (GMT)
committer Earl Miles2010-04-14 20:46:53 (GMT)
commit28a926470599f100a98a70f94f3818dbdcad4a2f (patch)
treede03b5135234170e0617fc8c6843fee3c0181e5b
parentab0f8ef437cf27f277d71330db3d18be9a318215 (diff)
#750004 by jhedstrom: Comment pane ignores node comment display setting.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--plugins/content_types/node_context/node_comments.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 428e821..55ba693 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -32,6 +32,7 @@ Initial inclusion of the stylizer plugin to create user customizable styles from
#741588 by Jody Lynn: add db_rewrite_sql() to comments pane query to match core.
#531366 by mikeker: Move token substitutions to prior to filtering in custom content type. This could have some effects on existing installs.
#718028 by redben: Improved documentation for wizard.inc
+#750004 by jhedstrom: Comment pane ignores node comment display setting.
ctools 6.x-1.3 (2010-Feb-01)
==============
diff --git a/plugins/content_types/node_context/node_comments.inc b/plugins/content_types/node_context/node_comments.inc
index 2291eda..da48e8f 100644
--- a/plugins/content_types/node_context/node_comments.inc
+++ b/plugins/content_types/node_context/node_comments.inc
@@ -85,7 +85,7 @@ function ctools_node_comments_content_type_admin_title($subtype, $conf, $context
*/
function ctools_comment_render($node, $conf) {
$output = '';
- if (!user_access('access comments')) {
+ if (!user_access('access comments') || !$node->comment) {
return;
}