Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
7643bb2f
Commit
7643bb2f
authored
Sep 28, 2012
by
catch
Browse files
Issue
#1797206
by Rob Loach: Fixed Actions module has variable name conflict which breaks tests.
parent
f988a548
Changes
1
Hide whitespace changes
Inline
Side-by-side
core/modules/action/action.module
View file @
7643bb2f
...
...
@@ -168,8 +168,7 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a
$query
->
addField
(
'actions'
,
'callback'
);
$query
->
addField
(
'actions'
,
'parameters'
);
$query
->
condition
(
'aid'
,
$conditions
,
'IN'
);
$result
=
$query
->
execute
();
foreach
(
$result
as
$action
)
{
foreach
(
$query
->
execute
()
as
$action
)
{
$actions
[
$action
->
aid
]
=
$action
->
parameters
?
unserialize
(
$action
->
parameters
)
:
array
();
$actions
[
$action
->
aid
][
'callback'
]
=
$action
->
callback
;
$actions
[
$action
->
aid
][
'type'
]
=
$action
->
type
;
...
...
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