Wrapper function isBegRallyeEnabled() introduced, rewrites to make usage of isExtensi...

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 4f1ad6f8e579e628c059c798fbcd3054698332f3..ba3588063aef2e71c416d33e56150c515db62a76 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -444,12 +444,12 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
        // Is content an array?
        if (is_array($content)) {
                // Add expiration to array
-               if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) {
+               if ((isConfigEntrySet('auto_purge')) && (getAutoPurge() == '0')) {
                        // Will never expire!
                        $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
                } elseif (isConfigEntrySet('auto_purge')) {
                        // Create nice date string
-                       $content['expiration'] = createFancyTime(getConfig('auto_purge'));
+                       $content['expiration'] = createFancyTime(getAutoPurge());
                } else {
                        // Missing entry
                        $content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}';