Index: notifications_content/notifications_content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications_content/notifications_content.module,v
retrieving revision 1.4.2.9.2.36.2.8
diff -u -p -r1.4.2.9.2.36.2.8 notifications_content.module
--- notifications_content/notifications_content.module	28 Apr 2009 10:22:01 -0000	1.4.2.9.2.36.2.8
+++ notifications_content/notifications_content.module	7 May 2009 16:25:27 -0000
@@ -107,7 +107,7 @@ function notifications_content_form_alte
     case 'comment_form':
       // Load the node which is possibly cached to get the node type
       $node = node_load($form['nid']['#value']);
-      if (notifications_content_type_enabled($node->type)) {    
+      if (notifications_content_type_enabled($node->type) && user_access('skip notifications')) {
         _notifications_content_add_disable_field($form);
         // If editing the comment, add values to remember
         if (!empty($form['cid']['#value']) && !empty($form['admin']['status'])) {
@@ -139,12 +139,12 @@ function notifications_content_form_alte
           $form['notifications']['notifications_content_type']['#description'] .= ' <strong>' . t('To enable these options check the <a href="@notifications-settings">Notifications content settings</a>', array('@notifications-settings' => url('admin/messaging/notifications/content'))) . '</strong>';
         }
       }
-      break;      
+      break;
     default:
       // Node form. Option to disable notifications
       if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
         $types = notifications_content_types(NULL);
-        if (notifications_content_type_enabled($form['#node']->type)) {
+        if (notifications_content_type_enabled($form['#node']->type) && user_access('skip notifications')) {
           _notifications_content_add_disable_field($form);
         }
       }
@@ -155,16 +155,16 @@ function notifications_content_form_alte
  * Add disable (skip notifications) field set
  */
 function _notifications_content_add_disable_field(&$form) {
-  // Add fieldset without affecting any other elements there
+  // Add fieldset without overwriting any child elements potentially there
   $form['notifications']['#type'] = 'fieldset';
   $form['notifications']['#title'] = t('Notifications');
-  $form['notifications']['#collapsible'] = TRUE;  
+  $form['notifications']['#collapsible'] = TRUE;
+  // Add skip option
   $form['notifications']['notifications_content_disable'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Do not send notifications for this update.'),
     '#default_value' => 0,
-    '#access' => user_access('skip notifications'),
-  );  
+  );
 }
 
 /**