From 97225fdf1ef9c68aa84e8f1151947e9ab9eddbd2 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 23 Apr 2014 10:46:33 +0200
Subject: [PATCH] [FIX] Merge conflict

---
 public/include/classes/user.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php
index 4cc7d1a7..f42dc936 100644
--- a/public/include/classes/user.class.php
+++ b/public/include/classes/user.class.php
@@ -597,7 +597,7 @@ class User extends Base {
     $this->debug->append("STA " . __METHOD__, 4);
     $user = array();
     $stmt = $this->mysqli->prepare("SELECT username, pass, id, timezone, is_admin FROM $this->table WHERE LOWER(username) = LOWER(?) LIMIT 1");
-    if ($this->checkStmt($stmt) && $stmt->bind_param('s', $username) && $stmt->execute() && $stmt->bind_result($row_username, $row_password, $row_id, $row_admin)) {
+    if ($this->checkStmt($stmt) && $stmt->bind_param('s', $username) && $stmt->execute() && $stmt->bind_result($row_username, $row_password, $row_id, $row_timezone, $row_admin)) {
       $stmt->fetch();
       $stmt->close();
       $aPassword = explode('$', $row_password);