ext-autopurge does now (not fully) maintain it

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 418888d0336638fc1a1a58023eb8e9cee443c884..d840d71f44f012752b305a3e47f224cc2dc94e33 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -467,10 +467,10 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
        // Is content an array?
        if (is_array($content)) {
                // Add expiration to array
-               if ((isConfigEntrySet('auto_purge')) && (getAutoPurge() == '0')) {
+               if ((isExtensionInstalled('autopurge')) && (getAutoPurge() == '0')) {
                        // Will never expire!
                        $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
-               } elseif (isConfigEntrySet('auto_purge')) {
+               } elseif ((isExtensionInstalled('autopurge')) && (isConfigEntrySet('auto_purge'))) {
                        // Create nice date string
                        $content['expiration'] = '{%config,createFancyTime=auto_purge%}';
                } else {