From: Alexander Ebert Date: Sat, 9 Mar 2013 22:41:35 +0000 (+0100) Subject: Using constants instead of magic numbers X-Git-Tag: 2.0.0_Beta_1~90^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=066957930a710236ad1be4a0f55549044333ff24;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git Using constants instead of magic numbers --- diff --git a/files/lib/data/conversation/Conversation.class.php b/files/lib/data/conversation/Conversation.class.php index fc56a9a..010a60f 100644 --- a/files/lib/data/conversation/Conversation.class.php +++ b/files/lib/data/conversation/Conversation.class.php @@ -156,7 +156,7 @@ class Conversation extends DatabaseObject implements IBreadcrumbProvider, IRoute public function getParticipantIDs($excludeLeftParticipants = false) { $conditions = new PreparedStatementConditionBuilder(); $conditions->add("conversationID = ?", array($this->conversationID)); - if ($excludeLeftParticipants) $conditions->add("hideConversation <> ?", array(2)); + if ($excludeLeftParticipants) $conditions->add("hideConversation <> ?", array(self::STATE_LEFT)); $sql = "SELECT participantID FROM wcf".WCF_N."_conversation_to_user diff --git a/files/lib/data/conversation/message/ConversationMessageAction.class.php b/files/lib/data/conversation/message/ConversationMessageAction.class.php index acb6efa..2f05419 100644 --- a/files/lib/data/conversation/message/ConversationMessageAction.class.php +++ b/files/lib/data/conversation/message/ConversationMessageAction.class.php @@ -104,9 +104,9 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements AND hideConversation = ?"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array( - 0, + Conversation::STATE_DEFAULT, $conversation->conversationID, - 1 + Conversation::STATE_HIDDEN )); }