Fix #6507 - sedning test emails

[Pman.Core] / DataObjects / Core_notify.php

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index fd366d4..2cc4a12 100644 (file)
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * Table is designed to be used with a mailer to notify or issue
+ * Table iend designed to be used with a mailer to notify or issue
  * emails (or maybe others later??)
  *
  *
@@ -20,7 +20,7 @@ CREATE TABLE  core_notify  (
 );
 **/
 
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_notify extends DB_DataObject 
 {
@@ -55,8 +55,6 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($set !== false) {
             $this->person_table = is_object($set) ? $set->tableName() : '';
             
-            
-            
             $person_table = empty($this->person_table) ? $def_pt  : strtolower($this->person_table);
             $col = $person_table  == $def_pt ? 'person_id' : $person_table . '_id';
             
@@ -318,22 +316,28 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         
     }
     
-    function sendManual()
+    function sendManual($debug=false)
     {   
         require_once 'Pman/Core/NotifySend.php';
         
         $send = new Pman_Core_NotifySend();
         $send->error_handler = 'exception';
         
-        try {
+        if ($debug) {
             $send->get($this->id, array());
+            return true;
+        }
+        
+        try {
+            $send->get($this->id, array('force' => 1));
         } catch (Exception $e) {
-            // nothing to do
+            ob_end_clean();
+            return $e;
         }
         
         ob_end_clean();
         
-        return;
+        return true;
     }
     
 }