Merge branch 'master' into develop

CHANGELOG.md

@@ -1,6 +1,11 @@
 HumHub Changelog
 ================
 
+1.8.3 (Unreleased)
+----------------------
+- Fix #29: Fix login form view on browser back button after footer link
+- Fix #5066: Fix pin and archive global content without container
+
 
 1.8.2 (April 26, 2021)
 ----------------------

composer.json

@@ -36,7 +36,7 @@
         "npm-asset/bootstrap-tour": "0.11.0",
         "npm-asset/clipboard-polyfill": "3.0.*",
         "npm-asset/font-awesome": "^4.7.0",
-        "npm-asset/humhub-prosemirror-richtext": "1.1.3",
+        "npm-asset/humhub-prosemirror-richtext": "1.1.5",
         "npm-asset/imagesloaded": "*",
         "npm-asset/intersection-observer": "^0.7.0",
         "npm-asset/jplayer": "2.9.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8ce4dc3e98c455997a22f12c165d2cd9",
+    "content-hash": "e25fa2ed3ad8e6c99542573587da0caa",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -3392,10 +3392,10 @@
         },
         {
             "name": "npm-asset/humhub-prosemirror-richtext",
-            "version": "1.1.3",
+            "version": "1.1.5",
             "dist": {
                 "type": "tar",
-                "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.1.3.tgz"
+                "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.1.5.tgz"
             },
             "type": "npm-asset",
             "license": [

package-lock.json

@@ -1023,12 +1023,6 @@
           "requires": {
             "lodash": "^4.17.10"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
@@ -1235,9 +1229,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "iconv-lite": {
@@ -1551,9 +1545,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
     "longest": {

protected/humhub/modules/content/models/Content.php

@@ -371,6 +371,11 @@ class Content extends ActiveRecord implements Movable, ContentOwner
      */
     public function canPin()
     {
+        // Currently global content can not be pinned
+        if (!$this->getContainer()) {
+            return false;
+        }
+
         if ($this->isArchived()) {
             return false;
         }
@@ -410,12 +415,12 @@ class Content extends ActiveRecord implements Movable, ContentOwner
     public function canArchive()
     {
         // Currently global content can not be archived
-        if (!$this->contentcontainer_id) {
+        if (!$this->getContainer()) {
             return false;
         }
 
         // No need to archive content on an archived container, content is marked as archived already
-        if ($this->content->content->getContainer()->isArchived()) {
+        if ($this->getContainer()->isArchived()) {
             return false;
         }
 

protected/humhub/widgets/views/footerNavigation_login.php

@@ -14,7 +14,7 @@ $i = 0;
 <div class="text text-center powered">
     <?php if ($numItems > 0): ?>
         <?php foreach ($items as $item): ?>
-            <?= Html::a($item['label'], $item['url']); ?>
+            <?= Html::a($item['label'], $item['url'], ['data-pjax-prevent' => true]); ?>
 
             <?php if (++$i !== $numItems): ?>
                 &nbsp;&middot;&nbsp;