From d476e02cca701687022b734b396ca49267c5e103 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 9 Nov 2009 03:18:47 +0000
Subject: [PATCH] Yet another 'empty version' fixed

---
 inc/libs/user_functions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 6fc8006e05..18fd084d45 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -294,12 +294,12 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 		fetchUserData($userid);
 	}
 
+	// Load entry
+	$content = getUserDataArray();
+	if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+
 	// Is there an entry?
 	if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
-		// Load entry
-		$content = getUserDataArray();
-		if (!empty($content['userid'])) $userid = bigintval($content['userid']);
-
 		// Check for old MD5 passwords
 		if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
 			// Just set the hash to the password from DB... :)
@@ -325,7 +325,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			// Probe for last online timemark
 			$probe = time() -  $content['last_online'];
 			if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
-			if ((getExtensionVersion('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) {
+			if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && ($probe >= getConfig('login_timeout'))) {
 				// Add login bonus to user's account
 				$add = ', `login_bonus`=`login_bonus`+{?login_bonus?}';
 				$GLOBALS['bonus_payed'] = true;
-- 
2.30.2