From: Roland Häder <roland@mxchange.org>
Date: Thu, 1 Apr 2010 17:59:08 +0000 (+0000)
Subject: Rewritten to use isExtensionInstalledAndNewer() to save some calls/bugfix
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f5f55cd28eebd7b389c13f7c3be500ff43d0a28;p=mailer.git

Rewritten to use isExtensionInstalledAndNewer() to save some calls/bugfix
---

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index ed49e2e4e9..a73aaab6f4 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
@@ -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