From 2bc1a7b13be20b86970b388dbcdb4bfcba3eb4ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joshua=20R=C3=BCsweg?= Date: Sun, 27 Jul 2014 19:23:14 +0200 Subject: [PATCH] fetching user-options in getUserBy*() methods --- .../install/files/lib/data/user/User.class.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php index 6a0fe802a2..658b098a7b 100644 --- a/wcfsetup/install/files/lib/data/user/User.class.php +++ b/wcfsetup/install/files/lib/data/user/User.class.php @@ -288,9 +288,11 @@ final class User extends DatabaseObject implements IRouteController, IUserConten * @return \wcf\data\user\User */ public static function getUserByUsername($username) { - $sql = "SELECT * - FROM wcf".WCF_N."_user - WHERE username = ?"; + $sql = "SELECT user_option_value.*, user_table.* + FROM wcf".WCF_N."_user user_table + LEFT JOIN wcf".WCF_N."_user_option_value user_option_value + ON (user_option_value.userID = user_table.userID) + WHERE user_table.username = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array($username)); $row = $statement->fetchArray(); @@ -306,9 +308,11 @@ final class User extends DatabaseObject implements IRouteController, IUserConten * @return \wcf\data\user\User */ public static function getUserByEmail($email) { - $sql = "SELECT * - FROM wcf".WCF_N."_user - WHERE email = ?"; + $sql = "SELECT user_option_value.*, user_table.* + FROM wcf".WCF_N."_user user_table + LEFT JOIN wcf".WCF_N."_user_option_value user_option_value + ON (user_option_value.userID = user_table.userID) + WHERE user_table.email = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array($email)); $row = $statement->fetchArray(); -- 2.20.1