From c6ffaf4fd748375ba99c095f1a8fe21434ed9308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 6 Jun 2013 21:51:25 +0300 Subject: [PATCH] Fix selecting of global suspensions --- file/lib/acp/page/ChatSuspensionListPage.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file/lib/acp/page/ChatSuspensionListPage.class.php b/file/lib/acp/page/ChatSuspensionListPage.class.php index 4dbe385..4c3ec47 100644 --- a/file/lib/acp/page/ChatSuspensionListPage.class.php +++ b/file/lib/acp/page/ChatSuspensionListPage.class.php @@ -91,7 +91,7 @@ protected function initObjectList() { $this->objectList->sqlJoins .= $conditionJoins; $this->objectList->getConditionBuilder()->add('expires >= ?', array(TIME_NOW)); - $this->objectList->getConditionBuilder()->add('room_table.permanent = ?', array(1)); + $this->objectList->getConditionBuilder()->add('(room_table.permanent = ? OR suspension.roomID IS NULL)', array(1)); if ($this->filterType !== null) $this->objectList->getConditionBuilder()->add('suspension.type = ?', array($this->filterType)); if ($this->filterUserID !== null) $this->objectList->getConditionBuilder()->add('suspension.userID = ?', array($this->filterUserID)); if ($this->filterRoomID !== null) {