From 00e637397c31b8c7c68c88ed53af4c63c6feada0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 16 Oct 2013 17:53:29 +0200 Subject: [PATCH 1/3] Fix username of revoker in ChatSuspensionListPage --- file/lib/acp/page/ChatSuspensionListPage.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/file/lib/acp/page/ChatSuspensionListPage.class.php b/file/lib/acp/page/ChatSuspensionListPage.class.php index 94df1fb..02fb988 100644 --- a/file/lib/acp/page/ChatSuspensionListPage.class.php +++ b/file/lib/acp/page/ChatSuspensionListPage.class.php @@ -140,14 +140,14 @@ public function assignVariables() { protected function initObjectList() { parent::initObjectList(); - $this->objectList->sqlSelects .= "user_table.username, user_table2.username AS issuerUsername, user_table3.username AS revokerUsername, room_table.title AS roomTitle"; + $this->objectList->sqlSelects .= "user_table_muted.username, user_table_issuer.username AS issuerUsername, user_table_revoker.username AS revokerUsername, room_table.title AS roomTitle"; $this->objectList->sqlJoins .= " - LEFT JOIN wcf".WCF_N."_user user_table - ON suspension.userID = user_table.userID - LEFT JOIN wcf".WCF_N."_user user_table2 - ON suspension.issuer = user_table2.userID - LEFT JOIN wcf".WCF_N."_user user_table3 - ON suspension.issuer = user_table3.userID"; + LEFT JOIN wcf".WCF_N."_user user_table_muted + ON suspension.userID = user_table_muted.userID + LEFT JOIN wcf".WCF_N."_user user_table_issuer + ON suspension.issuer = user_table_issuer.userID + LEFT JOIN wcf".WCF_N."_user user_table_revoker + ON suspension.revoker = user_table_revoker.userID"; $conditionJoins = " LEFT JOIN chat".WCF_N."_room room_table ON suspension.roomID = room_table.roomID"; $this->objectList->sqlConditionJoins .= $conditionJoins; From 31ef9c7621df55b51cbb9811b6e00f007d84316c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 16 Oct 2013 19:46:06 +0200 Subject: [PATCH 2/3] Deliver uncompressed javascript in ACP --- acptemplate/messageLog.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acptemplate/messageLog.tpl b/acptemplate/messageLog.tpl index d31a383..23b3518 100644 --- a/acptemplate/messageLog.tpl +++ b/acptemplate/messageLog.tpl @@ -1,7 +1,7 @@ {include file='header' pageTitle='chat.acp.log.title'} {if CHAT_LOG_ARCHIVETIME !== 0} - + {if $errorField === ''}