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

- Rollback of patch #84250.

5.x
Dries Buytaert 2006-11-24 10:57:20 +00:00
parent 827f064deb
commit 7782ea2804
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/system/system.module
View File

@ -2069,7 +2069,7 @@ function system_theme_settings($key = '') {
* @param $question * @param $question
* The question to ask the user (e.g. "Are you sure you want to delete the * The question to ask the user (e.g. "Are you sure you want to delete the
* block <em>foo</em>?"). * block <em>foo</em>?").
* @param $destination * @param $path
* The page to go to if the user denies the action. * The page to go to if the user denies the action.
* @param $description * @param $description
* Additional text to display (defaults to "This action cannot be undone."). * Additional text to display (defaults to "This action cannot be undone.").
@ -2083,9 +2083,8 @@ function system_theme_settings($key = '') {
* @return * @return
* The form. * 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.'); $description = ($description) ? $description : t('This action cannot be undone.');
extract(parse_url($destination));
drupal_set_title($question); drupal_set_title($question);
$form['#attributes'] = array('class' => 'confirmation'); $form['#attributes'] = array('class' => 'confirmation');
$form['description'] = array('#value' => $description); $form['description'] = array('#value' => $description);
@ -2093,7 +2092,7 @@ function confirm_form($form, $question, $destination, $description = NULL, $yes
$form['actions'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>'); $form['actions'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
$form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm')); $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'; $form['#base'] = 'confirm_form';
return $form; return $form;
} }