### Eclipse Workspace Patch 1.0 #P head Index: commentmail/commentmail.info =================================================================== RCS file: /cvs/drupal/contributions/modules/commentmail/commentmail.info,v retrieving revision 1.1 diff -u -r1.1 commentmail.info --- commentmail/commentmail.info 10 Feb 2007 17:27:31 -0000 1.1 +++ commentmail/commentmail.info 2 Nov 2007 06:21:45 -0000 @@ -1,3 +1,4 @@ ; $Id: commentmail.info,v 1.1 2007/02/10 17:27:31 timcn Exp $ name = Comment Mail description = Sends an email message when comments are posted to the site. +core = 6.x \ No newline at end of file Index: commentmail/commentmail.module =================================================================== RCS file: /cvs/drupal/contributions/modules/commentmail/commentmail.module,v retrieving revision 1.12 diff -u -r1.12 commentmail.module --- commentmail/commentmail.module 18 Mar 2007 12:45:53 -0000 1.12 +++ commentmail/commentmail.module 2 Nov 2007 06:21:46 -0000 @@ -43,39 +43,28 @@ /** * Implementation of hook_menu() */ -function commentmail_menu($may_cache) { - $items = array(); - - if ($may_cache) { - $access = user_access('administer comments'); - - $items[] = array( - 'title' => t('Comment mail'), - 'path' => 'admin/settings/commentmail', - 'description' => t('Settings for the comment mail module.'), - 'access' => $access, - 'callback' => 'drupal_get_form', - 'callback arguments' => array('commentmail_admin_settings'), - ); - - $items[] = array( - 'title' => t('Approve comment'), - 'path' => 'comment/approve', - 'access' => $access, - 'callback' => 'drupal_get_form', - 'callback arguments' => array('commentmail_approve'), - 'type' => MENU_CALLBACK, - ); - - $items[] = array( - 'title' => t('Delete comment and ban user'), - 'path' => 'comment/deleteban', - 'access' => $access, - 'callback' => 'drupal_get_form', - 'callback arguments' => array('commentmail_deleteban'), - 'type' => MENU_CALLBACK, - ); - } +function commentmail_menu() { + $items['admin/settings/commentmail'] = array( + 'title' => t('Comment mail'), + 'description' => t('Settings for the comment mail module.'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('commentmail_admin_settings'), + 'access arguments' => array('administer comments'), + ); + $items['comment/approve'] = array( + 'title' => t('Approve comment'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('commentmail_approve'), + 'access arguments' => array('administer comments'), + 'type' => MENU_CALLBACK, + ); + $items['comment/deleteban'] = array( + 'title' => t('Delete comment and ban user'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('commentmail_deleteban'), + 'access arguments' => array('administer comments'), + 'type' => MENU_CALLBACK, + ); return $items; } Index: commentmail/README.txt =================================================================== RCS file: /cvs/drupal/contributions/modules/commentmail/README.txt,v retrieving revision 1.3 diff -u -r1.3 README.txt --- commentmail/README.txt 10 Feb 2007 17:27:31 -0000 1.3 +++ commentmail/README.txt 2 Nov 2007 06:21:45 -0000 @@ -10,4 +10,4 @@ email allows quick approval, editing, deletion, and/or banning of the poster's IP address (good for spam). -Module currently works with Drupal 5. \ No newline at end of file +Module currently works with Drupal 6. \ No newline at end of file