Fix #6032 - change the release index page to plain html

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 96ec985..34d2591 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -61,6 +61,11 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                     bcc_group_id = {$cgm}.group_id
             )  AS bcc_group_member_count
         ");
+       
+       if (!empty($_REQUEST['_hide_system_emails'])) {
+           $this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string');
+       }
+       
     }
     
     function beforeDelete($dependants_array, $roo)
@@ -87,17 +92,9 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             $c = DB_DataObject::factory('core_group_member');            
             $c->group_id = $this->to_group_id;
                         
-            if (!$c->count()) {
-                //cannot go to second check
-                if (!empty($request['_ignore_group_count'])) {
-                    if (!$request['_ignore_group_count']) {
-                        $roo->jerr('no_member',array('errcode'=> 100));
-                    }
-                } else {
-                    $roo->jerr('no_member',array('errcode'=> 100));
-                }
+            if (!$c->count() && empty($request['_ignore_group_count'])) {
+                $roo->jerr('Failed to create email template - No member found in recieptent group',array('errcode'=> 100));
             }
-            
         }
     }