Upgrading all contrib modules to their latest versions.

profiles/cod/modules/contrib/comment_notify/INSTALL.TXT

@@ -1,4 +1,3 @@
-$Id: INSTALL.TXT,v 1.7 2009/11/07 18:48:34 greggles Exp $
 
 INSTALLATION
 ------------

profiles/cod/modules/contrib/comment_notify/comment_notify-rtl.css

@@ -1,4 +1,3 @@
-/* $Id: comment_notify-rtl.css,v 1.1 2009/03/31 23:27:26 greggles Exp $ */
 #edit-notify-type-1-wrapper, #edit-notify-type-2-wrapper {
   float: right;
 }

profiles/cod/modules/contrib/comment_notify/comment_notify.css

@@ -1,4 +1,3 @@
-/* $Id: comment_notify.css,v 1.4 2009/03/31 23:27:26 greggles Exp $ */
 #edit-notify-type-1-wrapper, #edit-notify-type-2-wrapper {
   float: left;  /* LTR */
   display: inline;

profiles/cod/modules/contrib/comment_notify/comment_notify.info

@@ -1,12 +1,11 @@
-; $Id: comment_notify.info,v 1.3 2008/08/06 23:27:08 greggles Exp $
 name = Comment Notify
 description = "Comment follow-up e-mail notification for anonymous as well as registered users."
 dependencies[] = comment
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-10-11
-version = "6.x-1.5"
+; Information added by drupal.org packaging script on 2011-08-23
+version = "6.x-1.6"
 core = "6.x"
 project = "comment_notify"
-datestamp = "1286827567"
+datestamp = "1314101218"
 

profiles/cod/modules/contrib/comment_notify/comment_notify.install

@@ -1,5 +1,4 @@
 <?php
-// $Id: comment_notify.install,v 1.16.2.1 2010/10/11 01:08:29 greggles Exp $
 /**
  * @file
  * comment_notify.install.
@@ -48,7 +47,7 @@ function comment_notify_schema() {
         'disp-width' => '11'),
       'notify' => array(
         'type' => 'int',
-        'description' => 'A boolean indicator for whether or not they subscribed: 1 means subscribed, 0 means not subscribed.',
+        'description' => 'An integer indicating the type of subscription: 0 means not subscribed, 1 means subscribed to all comments, and 2 means only subscribed to replies of this comment.',
         'size' => 'tiny',
         'not null' => TRUE,
         'disp-width' => '11'),
@@ -80,12 +79,14 @@ function comment_notify_schema() {
           'disp-width' => '11'),
         'node_notify' => array(
           'type' => 'int',
+          'description' => 'An integer indicating the default type of subscription: 0 means not subscribed, 1 means subscribed to all comments, and 2 means only subscribed to replies of this comment.',
           'size' => 'tiny',
           'not null' => TRUE,
           'default' => 0,
           'disp-width' => '11'),
         'comment_notify' => array(
           'type' => 'int',
+          'description' => 'An integer indicating the default type of subscription: 0 means not subscribed, 1 means subscribed to all comments, and 2 means only subscribed to replies of this comment.',
           'size' => 'tiny',
           'not null' => TRUE,
           'default' => 0,
@@ -299,4 +300,13 @@ function comment_notify_update_6005() {
       'disp-width' => '11'));
 
   return $ret;
-}
+}
+
+/**
+ * Fix a missing default causes warnings for Postgresql and some MySQL.
+ */
+function comment_notify_update_6006() {
+  $ret = array();
+  db_change_field($ret, 'comment_notify', 'notified', 'notified',  array('type' => 'int', 'size' => 'small', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0));
+  return $ret;
+}

profiles/cod/modules/contrib/comment_notify/comment_notify.js

@@ -1,4 +1,3 @@
-// $Id: comment_notify.js,v 1.1 2009/02/13 21:43:16 greggles Exp $
 if (Drupal.jsEnabled) {
   $(document).ready(function() {
     $("#edit-notify-type-1").bind("click", function() {

profiles/cod/modules/contrib/comment_notify/comment_notify.module

@@ -1,5 +1,4 @@
 <?php
-// $Id: comment_notify.module,v 1.73.2.7 2010/10/11 01:37:58 greggles Exp $
 
 /**
  * @file
@@ -287,17 +286,17 @@ function comment_notify_user($type, &$edit, &$user, $category = NULL) {
         // Only show the node followup UI if the user has permission to create nodes.
         $nodes = FALSE;
         foreach (node_get_types() as $type) {
-          if (user_access('create '. $type->type .' content')) {
+          if (node_access('create', $type->type)) {
             $nodes = TRUE;
             break;
           }
         }
         if (user_access('administer nodes') || $nodes) {
           $form['comment_notify_settings']['node_notify_mailalert'] = array(
             '#type' => 'checkbox',
-            '#title' => t('Receive node follow-up notification e-mails'),
+            '#title' => t('Receive content follow-up notification e-mails'),
             '#default_value' => isset($edit['node_notify_mailalert']) ? $edit['node_notify_mailalert'] : variable_get('node_notify_default_mailalert', FALSE),
-            '#description' => t('Check this box to receive an e-mail notification for follow-ups on your nodes (pages, forum topics, etc). You can not disable notifications for individual threads.')
+            '#description' => t('Check this box to receive an e-mail notification for follow-ups on your content. You can not disable notifications for individual threads.')
           );
         }
         else {
@@ -342,6 +341,11 @@ function comment_notify_user($type, &$edit, &$user, $category = NULL) {
           $user->$property = $value;
         }
       }
+      else {
+        // If they have no preference, use the defaults.
+        $user->node_notify_mailalert = variable_get('node_notify_default_mailalert', FALSE);
+        $user->comment_notify_mailalert = variable_get('comment_notify_default_registered_mailalert', COMMENT_NOTIFY_NODE);
+      }
       break;
 
     case 'delete':

profiles/cod/modules/contrib/comment_notify/comment_notify.test

@@ -1,5 +1,4 @@
 <?php
-// $Id: comment_notify.test,v 1.4 2009/11/17 18:38:14 greggles Exp $
 
 class CommentNotifyTestCase extends DrupalWebTestCase {
   /**