From 7782ea28047c1f7ed635675e2cf61d952af5223c Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 24 Nov 2006 10:57:20 +0000 Subject: - Rollback of patch #84250. --- modules/system/system.module | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'modules/system/system.module') diff --git a/modules/system/system.module b/modules/system/system.module index e918dd201..4665ee86f 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2069,7 +2069,7 @@ function system_theme_settings($key = '') { * @param $question * The question to ask the user (e.g. "Are you sure you want to delete the * block foo?"). - * @param $destination + * @param $path * The page to go to if the user denies the action. * @param $description * Additional text to display (defaults to "This action cannot be undone."). @@ -2083,9 +2083,8 @@ function system_theme_settings($key = '') { * @return * The form. */ -function confirm_form($form, $question, $destination, $description = NULL, $yes = NULL, $no = NULL, $name = 'confirm') { +function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, $no = NULL, $name = 'confirm') { $description = ($description) ? $description : t('This action cannot be undone.'); - extract(parse_url($destination)); drupal_set_title($question); $form['#attributes'] = array('class' => 'confirmation'); $form['description'] = array('#value' => $description); @@ -2093,7 +2092,7 @@ function confirm_form($form, $question, $destination, $description = NULL, $yes $form['actions'] = array('#prefix' => '
', '#suffix' => '
'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm')); - $form['actions']['cancel'] = array('#value' => l($no ? $no : t('Cancel'), $path, null, $query, $fragment)); + $form['actions']['cancel'] = array('#value' => l($no ? $no : t('Cancel'), $path)); $form['#base'] = 'confirm_form'; return $form; } -- cgit v1.2.3