DRY up restoring of participants in ConversationDraftEditForm

diff --git a/files/lib/form/ConversationDraftEditForm.class.php b/files/lib/form/ConversationDraftEditForm.class.php
index 40845252fad62b48fbea0f7c5085e2453e1c3fa3..f330fa90d991c478edbe91ce2d0400ae384d0c5f 100644 (file)
--- a/files/lib/form/ConversationDraftEditForm.class.php
+++ b/files/lib/form/ConversationDraftEditForm.class.php
@@ -127,35 +127,23 @@ class ConversationDraftEditForm extends ConversationAddForm
 
             if ($this->conversation->draftData) {
                 $draftData = @\unserialize($this->conversation->draftData);
-                if (!empty($draftData['participants'])) {
-                    $condition = new PreparedStatementConditionBuilder();
-                    $condition->add('userID IN (?)', [$draftData['participants']]);
-
-                    $sql = "SELECT  username
-                            FROM    wcf" . WCF_N . "_user
-                            " . $condition;
-                    $statement = WCF::getDB()->prepareStatement($sql);
-                    $statement->execute($condition->getParameters());
-
-                    if (!empty($this->participants)) {
-                        $this->participants .= ', ';
-                    }
-                    $this->participants .= \implode(', ', $statement->fetchAll(\PDO::FETCH_COLUMN));
-                }
-                if (!empty($draftData['invisibleParticipants'])) {
-                    $condition = new PreparedStatementConditionBuilder();
-                    $condition->add('userID IN (?)', [$draftData['invisibleParticipants']]);
-
-                    $sql = "SELECT  username
-                            FROM    wcf" . WCF_N . "_user
-                            " . $condition;
-                    $statement = WCF::getDB()->prepareStatement($sql);
-                    $statement->execute($condition->getParameters());
-
-                    if (!empty($this->invisibleParticipants)) {
-                        $this->invisibleParticipants .= ', ';
+
+                foreach (['participants', 'invisibleParticipants'] as $participantType) {
+                    if (!empty($draftData[$participantType])) {
+                        $condition = new PreparedStatementConditionBuilder();
+                        $condition->add('userID IN (?)', [$draftData[$participantType]]);
+
+                        $sql = "SELECT  username
+                                FROM    wcf" . WCF_N . "_user
+                                " . $condition;
+                        $statement = WCF::getDB()->prepareStatement($sql);
+                        $statement->execute($condition->getParameters());
+
+                        if (!empty($this->{$participantType})) {
+                            $this->{$participantType} .= ', ';
+                        }
+                        $this->{$participantType} .= \implode(', ', $statement->fetchAll(\PDO::FETCH_COLUMN));
                     }
-                    $this->invisibleParticipants .= \implode(', ', $statement->fetchAll(\PDO::FETCH_COLUMN));
                 }
             }
         }