From 1df32c5a78467f18cc1599d517de30dc7634b21f Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 13 Oct 2013 13:54:52 +0200 Subject: [PATCH] Fixes code formatting --- wcfsetup/install/files/lib/acp/page/UserListPage.class.php | 2 +- wcfsetup/install/files/lib/data/tag/Tag.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php index 8e2a635778..a16e100d1f 100755 --- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php @@ -236,7 +236,7 @@ class UserListPage extends SortablePage { FROM wcf".WCF_N."_user user_table LEFT JOIN wcf".WCF_N."_user_option_value option_value ON (option_value.userID = user_table.userID) - LEFT JOIN wcf".WCF_N."_user_avatar user_avatar + LEFT JOIN wcf".WCF_N."_user_avatar user_avatar ON (user_avatar.avatarID = user_table.avatarID) ".$conditions." ORDER BY ".(($this->sortField != 'email' && isset($this->options[$this->sortField])) ? 'option_value.userOption'.$this->options[$this->sortField]['optionID'] : 'user_table.'.$this->sortField)." ".$this->sortOrder; diff --git a/wcfsetup/install/files/lib/data/tag/Tag.class.php b/wcfsetup/install/files/lib/data/tag/Tag.class.php index 6717dba0c2..c18d9a1457 100644 --- a/wcfsetup/install/files/lib/data/tag/Tag.class.php +++ b/wcfsetup/install/files/lib/data/tag/Tag.class.php @@ -35,8 +35,8 @@ class Tag extends DatabaseObject implements IRouteController { */ public static function getTag($name, $languageID = 0) { $sql = "SELECT * - FROM wcf".WCF_N."_tag - WHERE languageID = ? + FROM wcf".WCF_N."_tag + WHERE languageID = ? AND name = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array($languageID, $name)); -- 2.20.1