User id must be set now before we can use it

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 763a41d1f710a6601ace00b64936e72aa08c7d92..c7e4978ce06d380518dae021891ee4699ff816be 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -711,7 +711,7 @@ function setAdminHash ($admin, $hash) {
 // Init user data array
 function initUserData () {
        // User id should not be zero
-       if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Init the user
        $GLOBALS['user_data'][getCurrentUserId()] = array();
@@ -720,7 +720,7 @@ function initUserData () {
 // Getter for user data
 function getUserData ($column) {
        // User id should not be zero
-       if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Return the value
        return $GLOBALS['user_data'][getCurrentUserId()][$column];
@@ -729,7 +729,7 @@ function getUserData ($column) {
 // Geter for whole user data array
 function getUserDataArray () {
        // User id should not be zero
-       if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Get the whole array
        return $GLOBALS['user_data'][getCurrentUserId()];
@@ -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
-       if (getCurrentUserId() == '0') debug_report_bug(__FUNCTION__.': User id is zero.');
+       if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
        // Is the array there and filled?
        return ((isset($GLOBALS['user_data'][getCurrentUserId()])) && (count($GLOBALS['user_data'][getCurrentUserId()]) > 1));
@@ -752,8 +752,11 @@ function setCurrentUserId ($userid) {
 
 // Getter for current userid
 function getCurrentUserId () {
-       // Return zero if not set
-       if (!isset($GLOBALS['current_userid'])) return 0;
+       // Userid must be set before it can be used
+       if (!isset($GLOBALS['current_userid'])) {
+               // Not set
+               debug_report_bug('User id is not set.');
+       } // END - if
 
        // Return the userid
        return $GLOBALS['current_userid'];