Index: watcher.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/watcher/watcher.module,v
retrieving revision 1.2.2.6.2.19
diff -r1.2.2.6.2.19 watcher.module
536,537c536,564
<   //Notify those that watch this node
<   _watcher_email_notify_comment_insert($comment);
---
>   // Only send notifications if the comment does not need approval first
>   if (user_access('post comments without approval')) {
>     //Notify those that watch this node
>     _watcher_email_notify_comment_insert($comment);
>   }
> }
> 
> /**
>  * Implementation of hook_comment(), op: publish
>  */
> function _watcher_hook_comment_publish($comment) {
> 
>   // comment_publish is passed a comment as an object so we have to cast
>   // it as an array first
>   $comment = (array) $comment;
> 
>   // Check whether this is one of the node types for which Watcher is enabled
>   if (!_watcher_node_type_enabled($comment['nid'])) {
>     return false;
>   }
> 
>   $comment_author = user_load($comment['uid']);
> 
>   // If this comment was unpublished as a result of it requiring approval
>   // notify the users watching the node now that it's deemed worthy to publish
>   if (!user_access('post comments without approval', $comment_author)) {
>     //Notify those that watch this node
>     _watcher_email_notify_comment_insert($comment);
>   }
598d624
< 
1540a1567,1568
>  *
>  * TODO: Refactor into several functions
1623c1651
<   // Handle watching anonymous users
---
>   // Handle watching for anonymous users
3150c3178
< // EOF
\ No newline at end of file
---
> // EOF