X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=4da8ef31b200524115d5b34bb1e23de321738988;hb=bd6c043a3124914a3dc541b56400f551add987bf;hp=057ec6a052a90b93d8e82ccef64f43ef2a66c851;hpb=5bb45d38458106175065810aaf993fd15af1d8e4;p=mailer.git diff --git a/inc/template-functions.php b/inc/template-functions.php index 057ec6a052..4da8ef31b2 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -276,7 +276,6 @@ function loadTemplate ($template, $return = false, $content = array()) { // Init some data $ret = ''; - if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0'; // Base directory $basePath = sprintf("%stemplates/%s/html/", getPath(), getLanguage()); @@ -430,7 +429,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') { $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}'; } elseif (isConfigEntrySet('auto_purge')) { // Create nice date string - $content['expiration'] = createFancyTime(getAutoPurge()); + $content['expiration'] = '{%pipe,getAutoPurge,createFancyTime%}'; } else { // Missing entry $content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}';