Introduced 'per-what-word-wrapping

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index fe01016b23aa1d8f44fa7a7262812e5b678b7af5..c57e2c52e2fdad3e363e9f3a57b020b1b9821b53 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -467,7 +467,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
        // Is content an array?
        if (is_array($content)) {
                // Add expiration to array
-               if ((isExtensionInstalled('autopurge')) && (getAutoPurge() == '0')) {
+               if ((isExtensionInstalled('autopurge')) && (isConfigEntrySet('auto_purge')) && (getAutoPurge() == '0')) {
                        // Will never expire!
                        $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
                } elseif ((isExtensionInstalled('autopurge')) && (isConfigEntrySet('auto_purge'))) {