Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- #19353: Fix 'submit' button behaviour wrt optional previewing and form errors.

4.6.x
Steven Wittens 2005-03-27 21:34:50 +00:00
parent bf312dfe66
commit 54dfc577ba
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/node.module
View File

@ -1368,14 +1368,9 @@ function node_form($edit) {
// Add the buttons. // Add the buttons.
$output .= form_submit(t('Preview')); $output .= form_submit(t('Preview'));
if (!form_get_errors()) { if ($edit->type && (($_POST['op'] == t('Preview') && !form_get_errors()) || !variable_get('node_preview', 0))) {
if ($edit->title && $edit->type) {
$output .= form_submit(t('Submit')); $output .= form_submit(t('Submit'));
} }
elseif (!variable_get('node_preview', 0)) {
$output .= form_submit(t('Submit'));
}
}
if ($edit->nid && node_access('delete', $edit)) { if ($edit->nid && node_access('delete', $edit)) {
$output .= form_submit(t('Delete')); $output .= form_submit(t('Delete'));

7
modules/node/node.module
View File

@ -1368,14 +1368,9 @@ function node_form($edit) {
// Add the buttons. // Add the buttons.
$output .= form_submit(t('Preview')); $output .= form_submit(t('Preview'));
if (!form_get_errors()) { if ($edit->type && (($_POST['op'] == t('Preview') && !form_get_errors()) || !variable_get('node_preview', 0))) {
if ($edit->title && $edit->type) {
$output .= form_submit(t('Submit')); $output .= form_submit(t('Submit'));
} }
elseif (!variable_get('node_preview', 0)) {
$output .= form_submit(t('Submit'));
}
}
if ($edit->nid && node_access('delete', $edit)) { if ($edit->nid && node_access('delete', $edit)) {
$output .= form_submit(t('Delete')); $output .= form_submit(t('Delete'));