X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=NotifySend.php;h=91afa5a1b7c52f06a0e3f6f3f8841f1314150fed;hp=5cd8e1878a5ed6c73ac198cb74ffd87b52f0f51a;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hpb=11d53652d310b8ee56e74fdd1b64f74b6b7e8fe3 diff --git a/NotifySend.php b/NotifySend.php index 5cd8e187..91afa5a1 100644 --- a/NotifySend.php +++ b/NotifySend.php @@ -289,8 +289,8 @@ class Pman_Core_NotifySend extends Pman $ff = HTML_FlexyFramework::get(); - - $dom = array_pop(explode('@', $p->email)); + $explode_email = explode('@', $p->email); + $dom = array_pop($explode_email); $mxs = $this->mxs($dom); $ww = clone($w); @@ -622,7 +622,11 @@ class Pman_Core_NotifySend extends Pman return $object->$m($rcpt, $last_sent_date, $notify, $force); } - if (!method_exists($object, 'toEmail')) { + if (method_exists($object, 'toMailerData')) { + return $object->toMailerData(array( + 'rcpts'=>$rcpt, + 'person'=>$rcpt, // added as mediaoutreach used this? + )); //this is core_email - i think it's only used for testing... //var_Dump($object); //exit; }