summaryrefslogtreecommitdiff
path: root/modules/system/system.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system/system.module')
-rw-r--r--modules/system/system.module16
1 files changed, 10 insertions, 6 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index 3e6954f06..22e270383 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -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';