Index: flag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag.module,v
retrieving revision 1.11.2.68
diff -u -p -r1.11.2.68 flag.module
--- flag.module	14 Mar 2009 06:13:54 -0000	1.11.2.68
+++ flag.module	18 Jun 2009 17:42:24 -0000
@@ -956,7 +987,11 @@ function flag_flag($action, $flag, $cont
 
     $flag_action = $flag->get_flag_action($content_id);
     $flag_action->action = $action;
-    $context = (array)$flag_action;
+    $flag_action->hook = 'flag';
+    $flag_action->op = $flag_action->action;
+    $context = array_merge((array)$flag_action, $flag->get_relevant_action_objects($content_id));
+    $context['flag'] = $flag;
+    $context['account'] = $account;
     $aids = _trigger_get_hook_aids($action, $action);
     foreach ($aids as $aid => $action_info) {
       // The 'if ($aid)' is a safeguard against http://drupal.org/node/271460#comment-886564