Commit 7643bb2f authored by catch's avatar catch
Browse files

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

parent f988a548
......@@ -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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment