DataObjects/core.sql

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 51e6952..e167a74 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -178,7 +178,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     
     function processRelacements($replace_links = true)
     {   
-        $cfg = HTML_FlexyFramework::get()->Pman_Crm;
+        $cfg = isset(HTML_FlexyFramework::get()->Pman_Crm) ? HTML_FlexyFramework::get()->Pman_Crm : false;
         
         libxml_use_internal_errors (true);
         $doc = new DOMDocument('1.0', 'UTF-8');
@@ -267,7 +267,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         }
         
         if(empty($this->id)){
-            return false;
+            return PEAR::raiseError("template [{$contents['template']}]has not been set");
         }
         
         $contents['subject'] = $this->subject;