X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=dbf012bb5b2c3aa37b43af22c5e35ffea6d2847f;hp=44cd671da01c9df999cd676f52fe73d71919dc2a;hb=39538dd1c71297fb385a26c1aead204229558d44;hpb=5ea81cb4bf67681c434df6617ad720b3701504d5 diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index 44cd671d..dbf012bb 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -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'; @@ -328,7 +326,8 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject try { $send->get($this->id, array()); } catch (Exception $e) { - + ob_end_clean(); + return $e; } ob_end_clean();