Possible fix #3 for reflink

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index e9bd29b25ece037df65e7e7963af51f040d72b62..bc7e7714636bc0c6131ca21d9e8e5bc244fe8fe5 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -739,7 +739,7 @@ function getUserDataArray () {
 // in, but you should use isMember() if you want to find that out.
 function isUserDataValid () {
        // User id should not be zero so abort here
-       if (getCurrentUserId() < 1) return false;
+       if (!isCurrentUserIdSet()) return false;
 
        // Is the array there and filled?
        return ((isset($GLOBALS['user_data'][getCurrentUserId()])) && (count($GLOBALS['user_data'][getCurrentUserId()]) > 1));
@@ -753,7 +753,7 @@ function setCurrentUserId ($userid) {
 // Getter for current userid
 function getCurrentUserId () {
        // Userid must be set before it can be used
-       if (!isset($GLOBALS['current_userid'])) {
+       if (!isCurrentUserIdSet()) {
                // Not set
                debug_report_bug('User id is not set.');
        } // END - if
@@ -762,5 +762,10 @@ function getCurrentUserId () {
        return $GLOBALS['current_userid'];
 }
 
+// Checks if current userid is set
+function isCurrentUserIdSet () {
+       return isset($GLOBALS['current_userid']);
+}
+
 // [EOF]
 ?>