diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-05-31 03:12:19 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-05-31 03:12:19 +0000 |
| commit | a26efbeb5a0ad8b90c8eb2b20f06d34e69d2958f (patch) | |
| tree | f552be0bea60b63a791cc66cf362c3b684ff0610 /includes/actions.inc | |
| parent | 5b8d80b95d409a899821bf6b3b0825e1c24cd9dc (diff) | |
| download | brdo-a26efbeb5a0ad8b90c8eb2b20f06d34e69d2958f.tar.gz brdo-a26efbeb5a0ad8b90c8eb2b20f06d34e69d2958f.tar.bz2 | |
#408434 by mr.baileys and andypost: Fix fatal error in actions.inc after DBTNG conversion.
Diffstat (limited to 'includes/actions.inc')
| -rw-r--r-- | includes/actions.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/actions.inc b/includes/actions.inc index 7c7e301e6..d0091c1b1 100644 --- a/includes/actions.inc +++ b/includes/actions.inc @@ -47,7 +47,7 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a } $actions = array(); $available_actions = actions_list(); - $result = array(); + $actions_result = array(); if (is_array($action_ids)) { $conditions = array(); foreach ($action_ids as $action_id) { @@ -82,11 +82,11 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a if (is_numeric($action_id)) { $function = $params['callback']; $context = array_merge($context, $params); - $result[$action_id] = $function($object, $context, $a1, $a2); + $actions_result[$action_id] = $function($object, $context, $a1, $a2); } // Singleton action; $action_id is the function name. else { - $result[$action_id] = $action_id($object, $context, $a1, $a2); + $actions_result[$action_id] = $action_id($object, $context, $a1, $a2); } } } @@ -97,15 +97,15 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a $action = db_query("SELECT callback, parameters FROM {actions} WHERE aid = :aid", array(':aid' => $action_ids))->fetchObject(); $function = $action->callback; $context = array_merge($context, unserialize($action->parameters)); - $result[$action_ids] = $function($object, $context, $a1, $a2); + $actions_result[$action_ids] = $function($object, $context, $a1, $a2); } // Singleton action; $action_ids is the function name. else { - $result[$action_ids] = $action_ids($object, $context, $a1, $a2); + $actions_result[$action_ids] = $action_ids($object, $context, $a1, $a2); } } $stack--; - return $result; + return $actions_result; } /** |