summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-03-17 12:41:54 +0000
committerDries Buytaert <dries@buytaert.net>2009-03-17 12:41:54 +0000
commit4072ea46521512da7ff9f57a21cbeb4c4f7c2cfa (patch)
tree74688064bba20c91dd4dba27fd92ddff5cf812a3 /modules/node
parent917a37fb7e6f8ef522267d004a7ee365dd2cc23e (diff)
downloadbrdo-4072ea46521512da7ff9f57a21cbeb4c4f7c2cfa.tar.gz
brdo-4072ea46521512da7ff9f57a21cbeb4c4f7c2cfa.tar.bz2
- Patch #394374 by cwgordon7, wretched sinner, et al: improved language of comment status. Usability improvement based on testing in Baltimore.
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.api.php6
-rw-r--r--modules/node/node.install2
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 52d807f7f..b5a7adea9 100644
--- a/modules/node/node.api.php
+++ b/modules/node/node.api.php
@@ -261,7 +261,7 @@ function hook_node_load($nodes, $types) {
*/
function hook_node_prepare($node) {
if (!isset($node->comment)) {
- $node->comment = variable_get("comment_$node->type", COMMENT_NODE_READ_WRITE);
+ $node->comment = variable_get("comment_$node->type", COMMENT_NODE_OPEN);
}
}
@@ -293,7 +293,7 @@ function hook_node_prepare_translation($node) {
* Extra information to be added to the RSS item.
*/
function hook_node_rss_item($node) {
- if ($node->comment != COMMENT_NODE_DISABLED) {
+ if ($node->comment != COMMENT_NODE_HIDDEN) {
return array(array('key' => 'comments', 'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))));
}
else {
@@ -491,7 +491,7 @@ function hook_node_type($op, $info) {
break;
case 'update':
if (!empty($info->old_type) && $info->old_type != $info->type) {
- $setting = variable_get('comment_' . $info->old_type, COMMENT_NODE_READ_WRITE);
+ $setting = variable_get('comment_' . $info->old_type, COMMENT_NODE_OPEN);
variable_del('comment_' . $info->old_type);
variable_set('comment_' . $info->type, $setting);
}
diff --git a/modules/node/node.install b/modules/node/node.install
index d0867f328..b1ab08d64 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -67,7 +67,7 @@ function node_schema() {
'default' => 0,
),
'comment' => array(
- 'description' => 'Whether comments are allowed on this node: 0 = no, 1 = read only, 2 = read/write.',
+ 'description' => 'Whether comments are allowed on this node: 0 = no, 1 = closed (read only), 2 = open (read/write).',
'type' => 'int',
'not null' => TRUE,
'default' => 0,