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

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 5d859314..03b90721 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));
             }
-            
         }
     }
     
@@ -373,7 +363,8 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         if (!empty($this->bcc_group_id) && $this->bcc_group_id > 0 && empty($contents['bcc']) && empty($contents['rcpts_group'])) {
             $admin_grp = DB_DAtaObject::Factory('core_group')->load($this->bcc_group_id);
-	    $admin = $admin_grp->members('email');
+	    
+	    $admin = $admin_grp ?  $admin_grp->members('email') : false;
             
             if (empty($admin) && $admin_grp->name != 'Empty Group') { // allow 'empty group mname'
                 return $p->raiseError("template [{$contents['template']}] - bcc group is empty");