More deprecated checking boolean expressions fixed

diff --git a/inc/databases.php b/inc/databases.php
index 4b854c7b9d2d778d1892f96387fa8ef962bc17db..64a1c7a286fc9af730576dbfac2fc13c275a6e43 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "547");
+define('CURR_SVN_REVISION', "548");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/modules/order.php b/inc/modules/order.php
index d320cbddae7fea9a354d87acc752d1518011de1b..9d24c7d4eda36a12223b95d4944c17c41673a226 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -36,7 +36,7 @@ $URL = "";
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
+} elseif (!EXT_IS_ACTIVE("order"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 } elseif (!IS_MEMBER()) {

diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index f0450923b3cb35dfa888657046450c79efdaba3a..1067b359030c2c9e3c419e8180e8fd55d83a8de7 100644 (file)
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -34,7 +34,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
+} elseif ((!EXT_IS_ACTIVE("sponsor"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
        return;
 } elseif (!IS_SPONSOR()) {

diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php
index 27fcb6f39c13c1fe906d2f73598750218476910d..2fcd67209180bf2e751bb9dbdc2792769f149ce1 100644 (file)
--- a/inc/modules/sponsor/.php
+++ b/inc/modules/sponsor/.php
@@ -34,7 +34,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
+} elseif ((!EXT_IS_ACTIVE("sponsor"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
        return;
 } elseif (!IS_SPONSOR()) {

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 5032c961bc6423b21766435de6d89763d65c2785..5ef7faa807b5b87fbc6e2a9de4628abf03e62cb2 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -34,7 +34,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
+} elseif ((!EXT_IS_ACTIVE("sponsor"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
        return;
 } elseif (!IS_SPONSOR()) {

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index d8b04c9c83ff43e898f009264ff370fa9fa8f424..1db6bbdaf832b31b1773de9180c0faca49281bdd 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -34,7 +34,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
+} elseif ((!EXT_IS_ACTIVE("sponsor"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
        return;
 } elseif (!IS_SPONSOR()) {

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 95f0a3a4a7a2e67c067bdd41cc4cdc335b57f738..49454d7c80d1fd4bb6e376a6cc679d62f41ddaa7 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -34,7 +34,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
+} elseif ((!EXT_IS_ACTIVE("sponsor"))
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
        return;
 } elseif (!IS_SPONSOR()) {