Merge pull request #279 from topcoder-platform/issues-175

Issues-275, Issues-278

Author: jmgasper

Dockerfile

@@ -19,7 +19,7 @@ RUN git clone https://github.com/topcoder-platform/forums-plugins.git /tmp/forum
 
 # Remove SqlPlugin from PROD env
 RUN if [ "$ENV" = "prod" ]; \
-    then rm -R /tmp/forums-plugins/SqlPlugin; \
+    then rm -R /tmp/forums-plugins/DebugPlugin; \
     fi
 
 # Copy the Filestack plugin

vanilla/applications/vanilla/controllers/class.discussioncontroller.php

@@ -90,19 +90,19 @@ public function index($DiscussionID = '', $DiscussionStub = '', $Page = '') {
         // Define the query offset & limit.
         $Limit = c('Vanilla.Comments.PerPage', 30);
         $enableAutoOffset = c('Vanilla.Comments.AutoOffset');
+
+        $OffsetProvided = $Page != '';
+        list($Offset, $Limit) = offsetLimit($Page, $Limit);
         // FIX: Allow plugins (ReplyTo) to change page and limit.
         // https://github.com/topcoder-platform/forums/issues/254
         // https://github.com/topcoder-platform/forums/issues/256
         $this->EventArguments['Discussion'] = $this->Discussion;
-        $this->EventArguments['Page'] = & $Page;
+        $this->EventArguments['Offset'] = & $Offset;
         $this->EventArguments['Limit'] = & $Limit;
         $this->EventArguments['EnableAutoOffset'] = & $enableAutoOffset;
 
         $this->fireEvent('BeforeCalculatingOffsetLimit');
 
-        $OffsetProvided = $Page != '';
-        list($Offset, $Limit) = offsetLimit($Page, $Limit);
-
         // Check permissions.
         $Category = CategoryModel::categories($this->Discussion->CategoryID);
         $this->categoryPermission($Category, 'Vanilla.Discussions.View');

vanilla/applications/vanilla/models/class.categorymodel.php

@@ -359,7 +359,7 @@ public function follow($userID, $categoryID, $followed = null) {
         if (!is_array($category)) {
             throw new InvalidArgumentException('Category not found.');
         } elseif ($category['DisplayAs'] !== 'Discussions' && !$isFollowed) {
-            throw new InvalidArgumentException('Category not configured to display as discussions.');
+           // throw new InvalidArgumentException('Category not configured to display as discussions.');
         }
 
         $this->SQL->replace(

vanilla/library/Vanilla/Formatting/Quill/Blots/Embeds/ExternalBlot.php

@@ -7,6 +7,7 @@
 namespace Vanilla\Formatting\Quill\Blots\Embeds;
 
 use Gdn;
+use Gdn_Upload;
 use Vanilla\EmbeddedContent\AbstractEmbed;
 use Vanilla\EmbeddedContent\EmbedService;
 use Vanilla\Formatting\Quill\Blots\AbstractBlot;
@@ -113,6 +114,14 @@ public function renderQuote(): string {
                 } else {
                     return "<p><a href=\"$sanitizedUrl\">$sanitizedUrl</a></p>";
                 }
+            } elseif ($embedType == 'file') {
+                $fileName = $data['name'] ?? "";
+                $size = $data['size'] ?? "";
+                if($fileName && $size) {
+                    $formattedSize = Gdn_Upload::formatFileSize($size,2);
+                    return "<p><a href=\"$sanitizedUrl\">$fileName ($formattedSize)</a></p>";
+                }
+
             }
 
             return "<p><a href=\"$sanitizedUrl\">$sanitizedUrl</a></p>";