Syncing files from upstream.

biohack-me · Jan 4, 2022 · 0c73159 · 0c73159
1 parent fd4e2fa
commit 0c73159
Show file tree

Hide file tree

Showing 487 changed files with 22,570 additions and 13,576 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -6,7 +6,6 @@
     "recommendations": [
         "dbaeumer.vscode-eslint",
         "calebporzio.better-phpunit",
-        "msjsdiag.debugger-for-chrome",
         "eamodio.gitlens",
         "firsttris.vscode-jest-runner",
         "ziyasal.vscode-open-in-github",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -43,7 +43,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[yaml]": {
-        "editor.formatOnSave": true,
+        "editor.formatOnSave": false,
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[html]": {

diff --git a/addons/themes/keystone/addon.json b/addons/themes/keystone/addon.json
@@ -3,7 +3,6 @@
     "name": "Keystone",
     "description": "A responsive Vanilla theme with customization options.",
     "version": "2.0.1",
-    "hidden": false,
     "authors": [
         {
             "name": "Isis Graziatto",

diff --git a/addons/themes/theme-foundation/addon.json b/addons/themes/theme-foundation/addon.json
@@ -3,7 +3,6 @@
     "name": "Foundation",
     "description": "A responsive, asset-compatible Vanilla Forums theme.",
     "version": "1.0.0",
-    "hidden": false,
     "authors": [
         {
             "name": "Stéphane LaFlèche",

diff --git a/applications/conversations/addon.json b/applications/conversations/addon.json
@@ -16,4 +16,4 @@
         }
     ],
     "version": "3.0"
-}
+}
diff --git a/applications/conversations/controllers/api/ConversationsApiController.php b/applications/conversations/controllers/api/ConversationsApiController.php
@@ -521,11 +521,12 @@ public function normalizeOutput(array $dbRecord) {
             $dbRecord['name'] = ConversationModel::participantTitle($dbRecord, false);
         }
 
-        $defaultMsg = t('No messages.');
-        $lastBody = $dbRecord['LastBody'] ?? '';
-        $dbRecord['body'] = $lastBody
-            ?  (Gdn::formatService()->renderPlainText($dbRecord['LastBody'], $dbRecord['LastFormat']) ?: $defaultMsg)
-            : $defaultMsg;
+        if (!empty($dbRecord['LastBody'])) {
+            $dbRecord['body'] = $dbRecord['LastBody'];
+            $this->formatField($dbRecord, 'body', $dbRecord['LastFormat']);
+        } else {
+            $dbRecord['body'] = t('No messages.');
+        }
 
         $dbRecord['url'] = url("/messages/{$dbRecord['ConversationID']}", true);
 

diff --git a/applications/conversations/models/class.conversationmodel.php b/applications/conversations/models/class.conversationmodel.php
@@ -588,6 +588,8 @@ public function save($formPostValues, $settings = []) {
             // Add & apply any extra validation rules:
             $this->Validation->applyRule('Body', 'Required');
             $messageModel->Validation->applyRule('Body', 'Required');
+        } else {
+            $this->Validation->unapplyRule('Body', 'Required');
         }
 
         // Make sure that there is at least one recipient
@@ -768,7 +770,7 @@ public function countUnread($userID, $save = true) {
      * @param int $readingUserID Unique ID of current user.
      */
     public function markRead($conversationID, $readingUserID) {
-        // Update the the read conversation count for the user.
+        // Update the read conversation count for the user.
         $this->SQL->update('UserConversation uc')
             ->join('Conversation c', 'c.ConversationID = uc.ConversationID')
             ->set('uc.CountReadMessages', 'c.CountMessages', false)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ @@
             }
         ],
         "version": "3.0"
-    }
+    }