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

Issue #1797206 by Rob Loach: Fixed Actions module has variable name conflict which breaks tests.

8.0.x
catch 2012-09-28 10:06:11 +01:00
parent f988a548f8
commit 7643bb2faf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/action/action.module
View File

@ -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;