Commit e29eb4dd authored by Dries's avatar Dries

- Patch #922634 by sun: odd form actions in confirm_form().

parent f40a5c18
......@@ -2777,7 +2777,6 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
else {
$options = array('path' => $path);
}
$cancel = l($no ? $no : t('Cancel'), $options['path'], $options);
drupal_set_title($question, PASS_THROUGH);
......@@ -2785,12 +2784,17 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
$form['description'] = array('#markup' => $description);
$form[$name] = array('#type' => 'hidden', '#value' => 1);
$form['actions'] = array(
'#type' => 'actions',
'#attributes' => array('class' => array('container-inline')),
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => $yes ? $yes : t('Confirm'),
);
$form['actions']['cancel'] = array(
'#type' => 'link',
'#title' => $no ? $no : t('Cancel'),
'#href' => $options['path'],
'#options' => $options,
);
$form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm'));
$form['actions']['cancel'] = array('#markup' => $cancel);
// By default, render the form using theme_confirm_form().
if (!isset($form['#theme'])) {
$form['#theme'] = 'confirm_form';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment