Index: flag_actions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag_actions.module,v
retrieving revision 1.1.2.12.2.4
diff -u -r1.1.2.12.2.4 flag_actions.module
--- flag_actions.module	29 Sep 2009 01:45:37 -0000	1.1.2.12.2.4
+++ flag_actions.module	29 Sep 2009 02:26:40 -0000
@@ -424,6 +424,7 @@
     '#weight' => -9,
     '#theme' => 'flag_actions_flag_form',
     '#action' => $action,
+    '#flag' => $flag,
   );
 
   $form['flag']['flag'] = array(
@@ -465,6 +466,13 @@
     '#default_value' => $action->repeat_threshold,
   );
 
+  if ($flag->global) {
+    $form['flag']['threshold']['#disabled'] = 1;
+    $form['flag']['threshold']['#value'] = 1;
+    $form['flag']['repeat_threshold']['#access'] = FALSE;
+    $form['flag']['repeat_threshold']['#value'] = 0;
+  }
+
   // Merge in the standard flag action form.
   $action_form = $callback .'_form';
   $edit = array();
@@ -546,9 +554,14 @@
   $output  = '';
   $output .= '<div class="container-inline">';
   $output .= t('Perform action when content !event !threshold flags', array('!event' => $event, '!threshold' => $threshold));
+  if ($form['#flag']->global) {
+    $output .= ' ' . t('(global flags always have a threshold of 1)');
+  }
   $output .= '</div>';
   $output .= '<div class="container-inline">';
-  $output .= t('Repeat this action every !repeat_threshold additional flags after the threshold is reached', array('!repeat_threshold' => $repeat_threshold));
+  if (!$form['#flag']->global) {
+    $output .= t('Repeat this action every !repeat_threshold additional flags after the threshold is reached', array('!repeat_threshold' => $repeat_threshold));
+  }
   $output .= '</div>';
 
   $element = array(