From 44237e1eaf39b6311ee1568a623cba8fae7b2d31 Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <lucas@bartholemy.com>
Date: Sun, 3 Jan 2021 22:12:21 +0100
Subject: [PATCH 1/3] Fix grunt install in GitHub workflow

---
 .github/workflows/php-test.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index 37e6c5c362..040ef7dd42 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -94,9 +94,6 @@ jobs:
             - name: Install npm dependencies
               run: npm install
 
-            - name: Install Grunt
-              run: npm install -g grunt-cli
-
             - name: Build production assets
               run: grunt build-assets
 

From 5d2db8ad73bc6eac73abc3766bbe9f1967cc7f60 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurabakhtin@users.noreply.github.com>
Date: Thu, 7 Jan 2021 15:15:50 +0300
Subject: [PATCH 2/3] Fix #4743: LikeLink also when no CanLike permission

---
 CHANGELOG.md                                  |  1 +
 protected/humhub/modules/like/Events.php      |  4 ----
 .../humhub/modules/like/widgets/LikeLink.php  | 22 +++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47612d45d8..e960b4d375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ HumHub Changelog
 - Fix #4649: Success message rendered although password validation failed
 - Fix #4717: Repsonsive layout alignment issue on small screens
 - Fix #4715: Call to `Content::canArchive()` throws error on global content
+- Fix #4743: Hide "Like" link when no permission "Can like"
 
 
 1.7.1 (November 27, 2020)
diff --git a/protected/humhub/modules/like/Events.php b/protected/humhub/modules/like/Events.php
index abac49372c..5c2e68728c 100644
--- a/protected/humhub/modules/like/Events.php
+++ b/protected/humhub/modules/like/Events.php
@@ -92,10 +92,6 @@ class Events extends \yii\base\BaseObject
      */
     public static function onWallEntryLinksInit($event)
     {
-        if (!static::getModule()->isEnabled) {
-            return;
-        }
-
         $event->sender->addWidget(widgets\LikeLink::class, ['object' => $event->sender->object], ['sortOrder' => 10]);
     }
 
diff --git a/protected/humhub/modules/like/widgets/LikeLink.php b/protected/humhub/modules/like/widgets/LikeLink.php
index a93c6ea784..b715159ff6 100644
--- a/protected/humhub/modules/like/widgets/LikeLink.php
+++ b/protected/humhub/modules/like/widgets/LikeLink.php
@@ -8,6 +8,9 @@ use yii\helpers\Html;
 use humhub\modules\like\Module;
 use humhub\modules\like\models\Like as LikeModel;
 use humhub\modules\content\components\ContentActiveRecord;
+use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\like\permissions\CanLike;
+
 /**
  * This widget is used to show a like link inside the wall entry controls.
  *
@@ -24,15 +27,26 @@ class LikeLink extends \yii\base\Widget
      */
     public $object;
 
+    /**
+     * @inheritdoc
+     */
+    public function beforeRun()
+    {
+        if (!Yii::$app->getModule('like')->isEnabled ||
+            !isset($this->object->content->container) ||
+            !($this->object->content->container instanceof ContentContainerActiveRecord) ||
+            !$this->object->content->container->can(CanLike::class)) {
+            return false;
+        }
+
+        return parent::beforeRun();
+    }
+
     /**
      * Executes the widget.
      */
     public function run()
     {
-        if (Yii::$app->getModule('like')->isEnabled === false) {
-            return;
-        }
-
         $currentUserLiked = false;
         /** @var Module $module */
         $module = Yii::$app->getModule('like');

From bf628b84f18519d529e0505ab286e2b7af34cc2e Mon Sep 17 00:00:00 2001
From: Sam Sheridan <8161496+samsheridan@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:17:14 -0500
Subject: [PATCH 3/3] Fix #4744: Banner image orientation not being processed

---
 CHANGELOG.md                                 | 1 +
 protected/humhub/libs/ProfileBannerImage.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e960b4d375..f9d9744e5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ HumHub Changelog
 - Fix #4649: Success message rendered although password validation failed
 - Fix #4717: Repsonsive layout alignment issue on small screens
 - Fix #4715: Call to `Content::canArchive()` throws error on global content
+- Fix #4744: Banner image orientation not being processed
 - Fix #4743: Hide "Like" link when no permission "Can like"
 
 
diff --git a/protected/humhub/libs/ProfileBannerImage.php b/protected/humhub/libs/ProfileBannerImage.php
index d24e5a9a58..7dfd176c3e 100644
--- a/protected/humhub/libs/ProfileBannerImage.php
+++ b/protected/humhub/libs/ProfileBannerImage.php
@@ -8,6 +8,7 @@
 
 namespace humhub\libs;
 
+use humhub\modules\file\libs\ImageHelper;
 use Imagine\Image\Box;
 use Imagine\Image\ManipulatorInterface;
 use yii\imagine\Image;
@@ -74,6 +75,7 @@ class ProfileBannerImage extends ProfileImage
 
         // Make sure original file is max. 800 width
         $image = Image::getImagine()->open($file);
+        ImageHelper::fixJpegOrientation($image, $file);
         if ($image->getSize()->getWidth() > 2000) {
             $image->resize($image->getSize()->widen(2000));
         }