From: Roland Häder <roland@mxchange.org>
Date: Mon, 12 Nov 2012 19:05:44 +0000 (+0000)
Subject: ext-autopurge does now (not fully) maintain it
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=35cbaaa8327e421adb0d19244e60713275842efe;p=mailer.git

ext-autopurge does now (not fully) maintain it
---

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 418888d033..d840d71f44 100644
--- 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 {