Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.40
diff -u -p -r1.40 trigger.module
--- modules/trigger/trigger.module	1 Jul 2009 20:39:20 -0000	1.40
+++ modules/trigger/trigger.module	9 Jul 2009 18:57:12 -0000
@@ -207,9 +207,9 @@ function _trigger_normalize_node_context
  */
 function _trigger_node($node, $op, $a3 = NULL, $a4 = NULL) {
   // Keep objects for reuse so that changes actions make to objects can persist.
-  static $objects;
+  $objects = &drupal_static(__FUNCTION__, array());
   // Prevent recursion by tracking which operations have already been called.
-  static $recursion;
+  $recursion = &drupal_static(__FUNCTION__ . ':recursion', array());
   if (isset($recursion[$op])) {
     return;
   }
@@ -342,7 +342,7 @@ function trigger_comment_view($comment) 
  */
 function _trigger_comment($a1, $op) {
   // Keep objects for reuse so that changes actions make to objects can persist.
-  static $objects;
+  $objects = &drupal_static(__FUNCTION__, array());
   $aids = _trigger_get_hook_aids('comment', $op);
   $context = array(
     'hook' => 'comment',
@@ -467,7 +467,7 @@ function trigger_user_view(&$edit, &$acc
  */
 function _trigger_user($op, &$edit, &$account, $category = NULL) {
   // Keep objects for reuse so that changes actions make to objects can persist.
-  static $objects;
+  $objects = &drupal_static(__FUNCTION__, array());
   $aids = _trigger_get_hook_aids('user', $op);
   $context = array(
     'hook' => 'user',