X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=34d2591be36bf0998d1f25eae4d4499bdde65e79;hb=39538dd1c71297fb385a26c1aead204229558d44;hp=5d859314171916d15823de00fbea7766f678c00a;hpb=b724fd27072c1b3fecb60264069d142cb26987a6;p=Pman.Core

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 5d859314..34d2591b 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -63,9 +63,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         ");
 	
 	if (!empty($_REQUEST['_hide_system_emails'])) {
-	    $this->whereAdd(" name NOT IN (
-		'EVENT_ERRORS_REPORT'
-	    )");
+	    $this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string');
 	}
 	
     }
@@ -94,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));
             }
-            
         }
     }