From: john Date: Wed, 10 Jan 2018 08:18:48 +0000 (+0800) Subject: DataObjects/Core_email.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f1ce7de230dc9427c0fc883cb652e3faa6878d14 DataObjects/Core_email.php --- diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php index 341bdd3f..f86f2848 100644 --- a/DataObjects/Core_email.php +++ b/DataObjects/Core_email.php @@ -305,18 +305,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject $p = new PEAR(); $contents = (array)$obj; - - if (!empty($obj['subject_replace'])) { - $mapping = array( - '/{person.name}/' => $obj['person']->name - ); - $subject = $obj['subject']; - foreach ($mapping as $pattern => $replace) { - $subject = preg_replace($pattern,$replace,$subject); - } - $content['subject'] = $subject; - } - + if(empty($this->id) && !empty($contents['template'])){ $this->get('name', $contents['template']); }