From bcfcca7cda66276c67bd4e47a793dd1468aa54db Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 24 Jun 2012 00:25:47 +0100
Subject: [PATCH] checking the engine can trigger a database init...

---
 core/user.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/user.class.php b/core/user.class.php
index 5c6df9a9..bf013bf9 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -43,14 +43,14 @@ class User {
 
 	public static function by_session(/*string*/ $name, /*string*/ $session) {
 		global $config, $database;
-		if($database->engine->name === "mysql") {
-			$query = "SELECT * FROM users WHERE name = :name AND md5(concat(pass, :ip)) = :sess";
-		}
-		else {
-			$query = "SELECT * FROM users WHERE name = :name AND md5(pass || :ip) = :sess";
-		}
 		$row = $database->cache->get("user-session-$name-$session");
 		if(!$row) {
+			if($database->engine->name === "mysql") {
+				$query = "SELECT * FROM users WHERE name = :name AND md5(concat(pass, :ip)) = :sess";
+			}
+			else {
+				$query = "SELECT * FROM users WHERE name = :name AND md5(pass || :ip) = :sess";
+			}
 			$row = $database->get_row($query, array("name"=>$name, "ip"=>get_session_ip($config), "sess"=>$session));
 			$database->cache->set("user-session-$name-$session", $row, 300);
 		}