From 546719769bcd61d7df7cb640effda3fcbf1131d7 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 7 Jun 2007 03:45:57 +0000 Subject: [PATCH] - Patch #101319 by pwolanin: make sure that node->revision can be altered. --- modules/node/node.module | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/node/node.module b/modules/node/node.module index 14cddb13aef..1df162468ff 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2022,6 +2022,19 @@ function node_object_prepare(&$node) { $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O'); } } + + $node_options = variable_get('node_options_'. $node->type, array('status', 'promote')); + // If this is a new node, fill in the default values. + if (!isset($node->nid)) { + foreach (array('status', 'promote', 'sticky') as $key) { + $node->$key = in_array($key, $node_options); + } + global $user; + $node->uid = $user->uid; + } + // Always use the default revision setting. + $node->revision = in_array('revision', $node_options); + node_invoke($node, 'prepare'); node_invoke_nodeapi($node, 'prepare'); } @@ -2067,18 +2080,6 @@ function node_form(&$form_state, $node) { $form['title']['#weight'] = -5; } - $node_options = variable_get('node_options_'. $node->type, array('status', 'promote')); - // If this is a new node, fill in the default values. - if (!isset($node->nid)) { - foreach (array('status', 'promote', 'sticky') as $key) { - $node->$key = in_array($key, $node_options); - } - global $user; - $node->uid = $user->uid; - } - // Always use the default revision setting. - $node->revision = in_array('revision', $node_options); - $form['#node'] = $node; // Add a log field if the "Create new revision" option is checked, or if the