More complete rewrite to use wrapper function isExtensionInstalledAndNewer(), some...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index a7a36334f8e61603a01017d486d8c7f26bd4d6c0..cc17b3e381c9074b5a4d5771d03d20638e5e108d 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -586,7 +586,7 @@ function FILTER_HTML_INCLUDE_USERS ($mode) {
 
        // HTML mail?
        if ($mode == 'html') $MORE = " AND `html`='Y'";
-       if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                // Add something for the holiday extension
                $MORE .= " AND `holiday_active`='N'";
        } // END - if
@@ -913,8 +913,8 @@ LIMIT 1",
                        array(getMemberId()), __FILE__, __LINE__);
 
                // Store it in session
-               setSession('mxchange_member_failures' , getUserData('login_failures'));
-               setSession('mxchange_member_last_failure', getUserData('last_failure'));
+               setSession('mailer_member_failures' , getUserData('login_failures'));
+               setSession('mailer_member_last_failure', getUserData('last_failure'));
        } // END - if
 }