X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=c9bfafc8b1a5d2b84a7716cb103e554e2ccad803;hb=0f0e365a0e710b750d74ef8587dde8b37881dbeb;hp=ed49e2e4e92a63dd5c493da1e891feda855cb243;hpb=818e401745e18765772fc6576c5ffcd05ff78faa;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index ed49e2e4e9..c9bfafc8b1 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -64,13 +64,16 @@ $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
 // Do we have ext-holiday installed?
 // @TODO Rewrite this to a filter
 $extraColumn = 'userid';
-if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 	// Fetch also holiday activation data
 	$extraColumn = 'holiday_active';
 } // END - if
 
 $result_mmails = SQL_QUERY_ESC("SELECT
-	`userid`, `receive_mails`, `mail_orders`, `".$extraColumn."`
+	`userid`,
+	`receive_mails`,
+	`mail_orders`,
+	`".$extraColumn."`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -94,7 +97,7 @@ if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
 // Now check his points amount
 $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');;
 
-if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) {
+if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
 	// Holiday is active!
 	loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE'));
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
@@ -248,7 +251,7 @@ ORDER BY
 			// Load receivers from database
 			$TEST = array(); $cnt = '0';
 			while ($holidayContent = SQL_FETCHARRAY($result)) {
-				if (getExtensionVersion('holiday') >= '0.1.3') {
+				if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 					// Check for his holiday status
 					$result_holiday = SQL_QUERY_ESC("SELECT
 	`id`
@@ -471,7 +474,7 @@ ORDER BY
 				while (list($ucat) = SQL_FETCHROW($result_userids)) {
 					// Check for holiday system
 					$HOL_ACTIVE = false;
-					if (getExtensionVersion('holiday') >= '0.1.3') {
+					if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 						// Check user's holiday status
 						$result_holiday = SQL_QUERY_ESC("SELECT
 	d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d