Merge branch 'develop' of github.com:humhub/humhub into develop

protected/humhub/docs/CHANGELOG_DEV.md

@@ -7,6 +7,7 @@ HumHub Change Log
 - Fix #4256: MOV file support broken with wrong MIME Type
 - Fix #4274: Force profile field attribute values of BaseTypeVirtual fields
 - Fix #1438: Error "User or Password incorrect." not translatable
+- Fix #4262: Additional hr in comment section
 
 
 1.6.0-beta.1 (July 16, 2020)

protected/humhub/modules/comment/migrations/m200715_184207_commentIndex.php

@@ -12,7 +12,8 @@ class m200715_184207_commentIndex extends Migration
      */
     public function safeUp()
     {
-        $this->createIndex('idx_comment_target', 'comment', ['object_model', 'object_id'], false);
+        // Was only used in beta version, avoid double index creation in stable version update
+        //$this->createIndex('idx_comment_target', 'comment', ['object_model', 'object_id'], false);
     }
 
     /**

protected/humhub/modules/comment/migrations/m200729_080349_commentIndex_fix_order.php

@@ -0,0 +1,48 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m200729_080349_commentIndex_fix_order
+ */
+class m200729_080349_commentIndex_fix_order extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        try {
+            $this->dropIndex('idx_comment_target', 'comment');
+        } catch (\Exception $ex) {
+            // May not exist, see migration m200715_184207_commentIndex
+        }
+
+        $this->createIndex('idx_comment_target', 'comment', ['object_id', 'object_model'], false);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        echo "m200729_080349_commentIndex_fix_order cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use up()/down() to run migration code without a transaction.
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m200729_080349_commentIndex_fix_order cannot be reverted.\n";
+
+        return false;
+    }
+    */
+}

protected/humhub/modules/comment/widgets/views/showMore.php

@@ -9,5 +9,4 @@
     <a href="#" data-action-click="comment.showMore" data-action-url="<?= $showMoreUrl ?>">
         <?= Yii::t('CommentModule.base', "Show {count} more comments", ['{count}' => $moreCount]) ?>
     </a>
-    <hr/>
 </div>