Index: modules/project_issue/project_issue.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.module,v retrieving revision 1.4.2.3.2.3 diff -u -p -r1.4.2.3.2.3 project_issue.module --- modules/project_issue/project_issue.module 7 Dec 2006 07:18:55 -0000 1.4.2.3.2.3 +++ modules/project_issue/project_issue.module 7 Dec 2006 11:32:52 -0000 @@ -278,39 +278,39 @@ function project_issue_project_edit_issu '#maxlength' => 255, '#description' => t('If you wish to receive a copy of all the issues to a central location specify an address here.'), ); - if (user_access('administer projects')) { - $options = project_issue_category(); - $form['email']['categories'] = array( - '#type' => 'item', - '#title' => t('Categories'), - '#description' => t('Which issue categories to e-mail. If none is checked all categories will be posted.'), - ); - $form['email']['mail_copy_filter']['#tree'] = TRUE; + $options = project_issue_category(); + $form['email']['categories'] = array( + '#type' => 'item', + '#title' => t('Categories'), + '#description' => t('Which issue categories to e-mail. If none is checked all categories will be posted.'), + ); + $form['email']['mail_copy_filter']['#tree'] = TRUE; - foreach ($options as $key => $choice) { - $form['email']['mail_copy_filter'][$key] = array( - '#type' => 'checkbox', - '#title' => $choice, - '#return_value' => $key, - '#default_value' => $node->mail_copy_filter[$key], - ); - } - $options = project_issue_state(); - $form['email']['states'] = array( - '#type' => 'item', - '#title' => t('States'), - '#description' => t('Which issue states to e-mail. If none is checked all states will be posted.'), + foreach ($options as $key => $choice) { + $form['email']['mail_copy_filter'][$key] = array( + '#type' => 'checkbox', + '#title' => $choice, + '#return_value' => $key, + '#default_value' => $node->mail_copy_filter[$key], ); - $form['email']['mail_copy_filter_state']['#tree'] = TRUE; - foreach ($options as $key => $choice) { - $form['email']['mail_copy_filter_state'][$key] = array( - '#type' => 'checkbox', - '#title' => $choice, - '#return_value' => $key, - '#default_value' => $node->mail_copy_filter_state[$key], - ); - } + } + $options = project_issue_state(); + $form['email']['states'] = array( + '#type' => 'item', + '#title' => t('States'), + '#description' => t('Which issue states to e-mail. If none is checked all states will be posted.'), + ); + $form['email']['mail_copy_filter_state']['#tree'] = TRUE; + foreach ($options as $key => $choice) { + $form['email']['mail_copy_filter_state'][$key] = array( + '#type' => 'checkbox', + '#title' => $choice, + '#return_value' => $key, + '#default_value' => $node->mail_copy_filter_state[$key], + ); + } + if (user_access('administer projects')) { $form['email']['reminder'] = array( '#type' => 'item', '#title' => t('Monthly reminder'), Index: modules/project_issue/mail.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/mail.inc,v retrieving revision 1.60.2.3.2.2 diff -u -p -r1.60.2.3.2.2 mail.inc --- modules/project_issue/mail.inc 12 Nov 2006 09:22:15 -0000 1.60.2.3.2.2 +++ modules/project_issue/mail.inc 7 Dec 2006 11:32:52 -0000 @@ -322,16 +322,17 @@ function project_mail_notify($node) { user_mail($recipient->mail, $node->title, $body, implode("\n", $header)); } - if (count($project->mail_copy_filter) && !$project->mail_copy_filter[$node->category]) { + if (count(array_filter($project->mail_copy_filter)) && !$project->mail_copy_filter[$node->category]) { return; } - if (count($project->mail_copy_filter_state) && !$project->mail_copy_filter_state[$node->sid]) { + if (count(array_filter($project->mail_copy_filter_state)) && !$project->mail_copy_filter_state[$node->sid]) { return; } if ($project->mail_copy) { user_mail($project->mail_copy, $node->title, $body, implode("\n", $header)); + } }