Split additional joins into multiple lines

diff --git a/files/lib/data/conversation/ConversationParticipantList.class.php b/files/lib/data/conversation/ConversationParticipantList.class.php
index d19c5282ccd85e8b97fcb7ea1aef4d60202563cd..a9de865fd9744acf462abed815497a3ab47a1e6b 100644 (file)
--- a/files/lib/data/conversation/ConversationParticipantList.class.php
+++ b/files/lib/data/conversation/ConversationParticipantList.class.php
@@ -52,13 +52,18 @@ class ConversationParticipantList extends UserProfileList
                 );
             }
         }
-        $this->sqlConditionJoins .= " LEFT JOIN wcf" . WCF_N . "_user user_table ON user_table.userID = conversation_to_user.participantID";
+        $this->sqlConditionJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_user user_table
+            ON          user_table.userID = conversation_to_user.participantID";
 
         if (!empty($this->sqlSelects)) {
             $this->sqlSelects .= ',';
         }
         $this->sqlSelects = 'conversation_to_user.*';
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_conversation_to_user conversation_to_user ON conversation_to_user.participantID = user_table.userID AND conversation_to_user.conversationID = " . $conversationID;
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_conversation_to_user conversation_to_user
+            ON          conversation_to_user.participantID = user_table.userID
+                    AND conversation_to_user.conversationID = " . $conversationID;
     }
 
     /**

diff --git a/files/lib/data/conversation/UserConversationList.class.php b/files/lib/data/conversation/UserConversationList.class.php
index 1083c5fa5ab9c507f17590441286114af42477a4..2a06ebf2db76e5b21af7c49135d525e4903ea475 100644 (file)
--- a/files/lib/data/conversation/UserConversationList.class.php
+++ b/files/lib/data/conversation/UserConversationList.class.php
@@ -67,7 +67,9 @@ class UserConversationList extends ConversationList
             $this->getConditionBuilder()->add('conversation_to_user.participantID = ?', [$userID]);
             $this->getConditionBuilder()
                 ->add('conversation_to_user.hideConversation = ?', [$this->filter == 'hidden' ? 1 : 0]);
-            $this->sqlConditionJoins = "LEFT JOIN wcf" . WCF_N . "_conversation conversation ON conversation.conversationID = conversation_to_user.conversationID";
+            $this->sqlConditionJoins = "
+                LEFT JOIN   wcf" . WCF_N . "_conversation conversation
+                ON          conversation.conversationID = conversation_to_user.conversationID";
             if ($this->filter == 'outbox') {
                 $this->getConditionBuilder()->add('conversation.userID = ?', [$userID]);
             }
@@ -84,14 +86,20 @@ class UserConversationList extends ConversationList
 
         // own posts
         $this->sqlSelects = "DISTINCT conversation_message.userID AS ownPosts";
-        $this->sqlJoins = "LEFT JOIN wcf" . WCF_N . "_conversation_message conversation_message ON conversation_message.conversationID = conversation.conversationID AND conversation_message.userID = " . $userID;
+        $this->sqlJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_conversation_message conversation_message
+            ON          conversation_message.conversationID = conversation.conversationID
+                    AND conversation_message.userID = " . $userID;
 
         // user info
         if (!empty($this->sqlSelects)) {
             $this->sqlSelects .= ',';
         }
         $this->sqlSelects .= "conversation_to_user.*";
-        $this->sqlJoins .= "LEFT JOIN wcf" . WCF_N . "_conversation_to_user conversation_to_user ON conversation_to_user.participantID = " . $userID . " AND conversation_to_user.conversationID = conversation.conversationID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_conversation_to_user conversation_to_user
+            ON          conversation_to_user.participantID = " . $userID . "
+                    AND conversation_to_user.conversationID = conversation.conversationID";
 
         if ($this->filter !== 'draft') {
             $this->sqlSelects .= ", conversation.*, CASE WHEN conversation_to_user.leftAt <> 0 THEN conversation_to_user.leftAt ELSE conversation.lastPostTime END AS lastPostTime";

diff --git a/files/lib/data/conversation/message/SearchResultConversationMessageList.class.php b/files/lib/data/conversation/message/SearchResultConversationMessageList.class.php
index ee6899413fb47d3d1879fc35229ee8bbe6201059..79e4b61731011c14ab220684590e9b67f8c744c9 100644 (file)
--- a/files/lib/data/conversation/message/SearchResultConversationMessageList.class.php
+++ b/files/lib/data/conversation/message/SearchResultConversationMessageList.class.php
@@ -33,6 +33,8 @@ class SearchResultConversationMessageList extends SimplifiedViewableConversation
             $this->sqlSelects .= ',';
         }
         $this->sqlSelects .= 'conversation.subject';
-        $this->sqlJoins .= " LEFT JOIN wcf" . WCF_N . "_conversation conversation ON conversation.conversationID = conversation_message.conversationID";
+        $this->sqlJoins .= "
+            LEFT JOIN   wcf" . WCF_N . "_conversation conversation
+            ON          conversation.conversationID = conversation_message.conversationID";
     }
 }

diff --git a/files/lib/page/ConversationFeedPage.class.php b/files/lib/page/ConversationFeedPage.class.php
index 5338093f761eb6e460d5332d112c2e1cf4635225..8910a2d76218e16d145aa5c8d338394e3c3a0cdc 100644 (file)
--- a/files/lib/page/ConversationFeedPage.class.php
+++ b/files/lib/page/ConversationFeedPage.class.php
@@ -30,7 +30,9 @@ class ConversationFeedPage extends AbstractFeedPage
         $this->items = new FeedConversationList();
         $this->items->getConditionBuilder()->add('conversation_to_user.participantID = ?', [WCF::getUser()->userID]);
         $this->items->getConditionBuilder()->add('conversation_to_user.hideConversation = ?', [0]);
-        $this->items->sqlConditionJoins = "LEFT JOIN wcf" . WCF_N . "_conversation conversation ON conversation.conversationID = conversation_to_user.conversationID";
+        $this->items->sqlConditionJoins = "
+            LEFT JOIN   wcf" . WCF_N . "_conversation conversation
+            ON          conversation.conversationID = conversation_to_user.conversationID";
         $this->items->sqlLimit = 20;
         $this->items->readObjects();