Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
221
Merge Requests
221
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
ad335b23
Commit
ad335b23
authored
Nov 17, 2006
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#84250
by yched and Moshe: providing a path with query string breaks the confirmation form.
parent
ad1c9e69
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
modules/system/system.module
modules/system/system.module
+4
-3
No files found.
modules/system/system.module
View file @
ad335b23
...
...
@@ -2075,7 +2075,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 <em>foo</em>?").
* @param $
path
* @param $
destination
* The page to go to if the user denies the action.
* @param $description
* Additional text to display (defaults to "This action cannot be undone.").
...
...
@@ -2089,8 +2089,9 @@ function system_theme_settings($key = '') {
* @return
* The form.
*/
function
confirm_form
(
$form
,
$question
,
$
path
,
$description
=
NULL
,
$yes
=
NULL
,
$no
=
NULL
,
$name
=
'confirm'
)
{
function
confirm_form
(
$form
,
$question
,
$
destination
,
$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
);
...
...
@@ -2098,7 +2099,7 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
$form
[
'actions'
]
=
array
(
'#prefix'
=>
'<div class="container-inline">'
,
'#suffix'
=>
'</div>'
);
$form
[
'actions'
][
'submit'
]
=
array
(
'#type'
=>
'submit'
,
'#value'
=>
$yes
?
$yes
:
t
(
'Confirm'
));
$form
[
'actions'
][
'cancel'
]
=
array
(
'#value'
=>
l
(
$no
?
$no
:
t
(
'Cancel'
),
$path
));
$form
[
'actions'
][
'cancel'
]
=
array
(
'#value'
=>
l
(
$no
?
$no
:
t
(
'Cancel'
),
$path
,
null
,
$query
,
$fragment
));
$form
[
'#base'
]
=
'confirm_form'
;
return
$form
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment