summaryrefslogtreecommitdiff
path: root/includes/actions.inc
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-11-30 09:20:27 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-11-30 09:20:27 +0000
commit6d4b0a24fad35cfbbf48d3b3f82ff5dbc243e5cb (patch)
tree13931aa2c715d7d263782fdd8f2472bc4349edcc /includes/actions.inc
parent333a540f41122649a002d9458142bef26ec9684a (diff)
downloadbrdo-6d4b0a24fad35cfbbf48d3b3f82ff5dbc243e5cb.tar.gz
brdo-6d4b0a24fad35cfbbf48d3b3f82ff5dbc243e5cb.tar.bz2
#194149 reported by hswong3i, in patch form by Rob Loach: action loading was using improper variable and property names
Diffstat (limited to 'includes/actions.inc')
-rw-r--r--includes/actions.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/includes/actions.inc b/includes/actions.inc
index ae5a05732..511776126 100644
--- a/includes/actions.inc
+++ b/includes/actions.inc
@@ -70,10 +70,9 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a
$where_clause = '('. strstr($where_clause, " ") .')';
$result_db = db_query('SELECT * FROM {actions} WHERE '. $where_clause, $where_values);
while ($action = db_fetch_object($result_db)) {
- $action_id = $action->action_id;
- $actions[$action_id] = $action->params ? unserialize($data->parameters) : array();
- $actions[$action_id]['callback'] = $action->callback;
- $actions[$action_id]['type'] = $action->type;
+ $actions[$action->aid] = $action->parameters ? unserialize($action->parameters) : array();
+ $actions[$action->aid]['callback'] = $action->callback;
+ $actions[$action->aid]['type'] = $action->type;
}
}