From e36c0e4cf8efd9d56cec9f739439bf65884acc04 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Jun 2012 13:05:01 +0000 Subject: [PATCH] Fix for fix --- inc/wrapper-functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index d53b0b6e21..f10335f044 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -571,7 +571,7 @@ function setWhatFromConfig ($configEntry) { // Checks wether what is set and optionally aborts on miss function isWhatSet ($strict = false) { // Check for it - $isset = ((isset($GLOBALS['__what']) && (!empty($GLOBALS['__what']))) || (is_null($GLOBALS['__what']))); + $isset = (isset($GLOBALS['__what']) && (!empty($GLOBALS['__what']))); // Should we abort here? if (($strict === true) && ($isset === false)) { @@ -606,7 +606,7 @@ function setAction ($newAction) { // Checks wether action is set and optionally aborts on miss function isActionSet ($strict = false) { // Check for it - $isset = (((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action']))) || (is_null($GLOBALS['__action']))); + $isset = ((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action']))); // Should we abort here? if (($strict === true) && ($isset === false)) { -- 2.39.2