X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=fb6dd781c89dd6a783e6075de53ba7a59fad76c4;hp=5844e6d4569633ff92cf89d0dcc4ac2a6c8af041;hb=2e51be12c871bb08502bdbdb0a85983baa14bc85;hpb=2f2865d1fe482da9da08928aa72bb8dc183a1b80 diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php index 5844e6d4..fb6dd781 100644 --- a/DataObjects/Core_email.php +++ b/DataObjects/Core_email.php @@ -539,9 +539,8 @@ Content-Transfer-Encoding: 7bit file_put_contents($cachePath, $this->bodytext); return; } - // use-file - $mailtext = file_get_contents($this->use_file); - + // use-file -- uses the original template... + $mailtext = file_get_contents($this->use_file); require_once 'Mail/mimeDecode.php'; require_once 'Mail/RFC822.php'; @@ -597,6 +596,17 @@ Content-Transfer-Encoding: 7bit return false; } + if (!empty($this->use_file)) { + $ctime = filemtime($cachePath); + $mtime = filemtime($this->use_file); + if($ctime >= $mtime){ + return true; + } + return false; + + } + + $ctime = filemtime($cachePath); $mtime = array();