diff options
| -rw-r--r-- | modules/node.module | 9 | ||||
| -rw-r--r-- | modules/node/node.module | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/modules/node.module b/modules/node.module index d828ae387..29aae45cb 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1368,13 +1368,8 @@ function node_form($edit) { // Add the buttons. $output .= form_submit(t('Preview')); - if (!form_get_errors()) { - if ($edit->title && $edit->type) { - $output .= form_submit(t('Submit')); - } - elseif (!variable_get('node_preview', 0)) { - $output .= form_submit(t('Submit')); - } + if ($edit->type && (($_POST['op'] == t('Preview') && !form_get_errors()) || !variable_get('node_preview', 0))) { + $output .= form_submit(t('Submit')); } if ($edit->nid && node_access('delete', $edit)) { diff --git a/modules/node/node.module b/modules/node/node.module index d828ae387..29aae45cb 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1368,13 +1368,8 @@ function node_form($edit) { // Add the buttons. $output .= form_submit(t('Preview')); - if (!form_get_errors()) { - if ($edit->title && $edit->type) { - $output .= form_submit(t('Submit')); - } - elseif (!variable_get('node_preview', 0)) { - $output .= form_submit(t('Submit')); - } + if ($edit->type && (($_POST['op'] == t('Preview') && !form_get_errors()) || !variable_get('node_preview', 0))) { + $output .= form_submit(t('Submit')); } if ($edit->nid && node_access('delete', $edit)) { |