summaryrefslogtreecommitdiff
path: root/modules/trigger
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-08-21 19:36:39 +0000
committerDries Buytaert <dries@buytaert.net>2008-08-21 19:36:39 +0000
commit69e6f411a9ed5dcf3f71d4320218620d3444d295 (patch)
treef4d393bbda7d814c825878785221b65c73b225f8 /modules/trigger
parent0e79597812ad0b6b72cf65bfc928c4a591d80ff1 (diff)
downloadbrdo-69e6f411a9ed5dcf3f71d4320218620d3444d295.tar.gz
brdo-69e6f411a9ed5dcf3f71d4320218620d3444d295.tar.bz2
- Patch #225450 by Crell, chx, bjaspan, catch, swentel, recidive et al: next generation database layer for Drupal 7.
Diffstat (limited to 'modules/trigger')
-rw-r--r--modules/trigger/trigger.module6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index d3d900fad..91416f5dc 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -295,7 +295,8 @@ function trigger_comment($a1, $op) {
actions_do($aid, $objects[$action_info['type']], $context);
}
else {
- actions_do($aid, (object) $a1, $context);
+ $a1 = (object) $a1;
+ actions_do($aid, $a1, $context);
}
}
}
@@ -387,8 +388,9 @@ function trigger_taxonomy($op, $type, $array) {
'hook' => 'taxonomy',
'op' => $op
);
+ $_array = (object) $array;
foreach ($aids as $aid => $action_info) {
- actions_do($aid, (object) $array, $context);
+ actions_do($aid, $_array, $context);
}
}