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

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 320c774ce890aeec5c55e6b1ea4bd344273b5703..8b1f6ce32bf7605360c93c05d83824976bbda41d 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1197,7 +1197,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
                        $year = date('Y', time());
 
                        // Use configured min age or fixed?
-                       if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+                       if (isExtensionInstalledAndNewer('order', '0.2.1')) {
                                // Configured
                                $startYear = $year - getConfig('min_age');
                        } else {
@@ -1225,7 +1225,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
                                // Get current year and subtract the configured minimum age
                                $OUT .= "<option value=\"".($minYear - 1)."\">&lt;" . $minYear."</option>\n";
                                // Calculate earliest year depending on extension version
-                               if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+                               if (isExtensionInstalledAndNewer('order', '0.2.1')) {
                                        // Use configured minimum age
                                        $year = date('Y', time()) - getConfig('min_age');
                                } else {
@@ -2107,7 +2107,7 @@ function generateEmailLink ($email, $table = 'admins') {
        if ((isExtensionActive('admins')) && ($table == 'admins')) {
                // Create email link for contacting admin in guest area
                $EMAIL = generateAdminEmailLink($email);
-       } elseif ((isExtensionActive('user')) && (getExtensionVersion('user') >= '0.3.3') && ($table == 'user_data')) {
+       } elseif ((isExtensionInstalledAndNewer('user', '0.3.3')) && ($table == 'user_data')) {
                // Create email link for contacting a member within admin area (or later in other areas, too?)
                $EMAIL = generateUserEmailLink($email, 'admin');
        } elseif ((isExtensionActive('sponsor')) && ($table == 'sponsor_data')) {