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

- Patch #306611 by jbomb, sun | Damien Tournoud: fixed fatal error when trying to invoke non-existing action callbacks.

merge-requests/26/head
Dries Buytaert 2009-09-20 07:47:44 +00:00
parent 7cf7f99878
commit 339085eb13
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/actions.inc
View File

@ -77,8 +77,13 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a
// Configurable actions need parameters. // Configurable actions need parameters.
if (is_numeric($action_id)) { if (is_numeric($action_id)) {
$function = $params['callback']; $function = $params['callback'];
$context = array_merge($context, $params); if (function_exists($function)) {
$actions_result[$action_id] = $function($object, $context, $a1, $a2); $context = array_merge($context, $params);
$actions_result[$action_id] = $function($object, $context, $a1, $a2);
}
else {
$actions_result[$action_id] = FALSE;
}
} }
// Singleton action; $action_id is the function name. // Singleton action; $action_id is the function name.
else { else {
@ -92,8 +97,13 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a
if (is_numeric($action_ids)) { if (is_numeric($action_ids)) {
$action = db_query("SELECT callback, parameters FROM {actions} WHERE aid = :aid", array(':aid' => $action_ids))->fetchObject(); $action = db_query("SELECT callback, parameters FROM {actions} WHERE aid = :aid", array(':aid' => $action_ids))->fetchObject();
$function = $action->callback; $function = $action->callback;
$context = array_merge($context, unserialize($action->parameters)); if (function_exists($function)) {
$actions_result[$action_ids] = $function($object, $context, $a1, $a2); $context = array_merge($context, unserialize($action->parameters));
$actions_result[$action_ids] = $function($object, $context, $a1, $a2);
}
else {
$actions_result[$action_ids] = FALSE;
}
} }
// Singleton action; $action_ids is the function name. // Singleton action; $action_ids is the function name.
else { else {