New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

[mailer.git] / inc / modules / member / action-order.php

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index a48c1d5cf30cd8b9d77362600c761566fc3383e8..37d2377e9e5dd39402deb92b0a6d1dfc7c07de9b 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -43,9 +43,9 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'order'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }
@@ -54,12 +54,12 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 
 // Load the include file
-$INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+$INC = sprintf("inc/modules/member/what-%s.php", getWhat());
 if (isIncludeReadable($INC)) {
        // Ok, we finally load the member action module
        loadInclude($INC);
 } else {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_ACTION'), $GLOBALS['what']));
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_ACTION'), getWhat()));
 }
 
 //