Merge branch 'master' into fix/undefinedindex

protected/humhub/docs/CHANGELOG.md

@@ -3,6 +3,8 @@ HumHub Changelog
 
 1.6.4 (Unreleased)
 ------------------
+- Fix #4361: Added missing nonce attribute in inline marketplace script
+- Fix #4371: Word break issue in notification dropdown
 - Fix #4355: Fixed error when authclient not providing an id attribute
 
 

protected/humhub/modules/marketplace/views/browse/list.php

@@ -50,7 +50,7 @@ use humhub\libs\Html;
     <?php endif; ?>
 </div>
 
-<script>
+<script <?= Html::nonce(); ?>>
     $('#categorySelect').change(function () {
         $('#filterForm').submit();
     });

protected/humhub/modules/marketplace/views/update/list.php

@@ -1,7 +1,7 @@
 <?php
 
 use humhub\modules\ui\icon\widgets\Icon;
-use yii\helpers\Html;
+use humhub\libs\Html;
 use yii\helpers\Url;
 
 /* @var $modules [] */
@@ -21,7 +21,8 @@ use yii\helpers\Url;
 
     <?php if (empty($modules)): ?>
         <br>
-        <div class="alert alert-success"><?= Icon::get('check')?> <?= Yii::t('MarketplaceModule.base', 'All modules are up to date!'); ?></div>
+        <div
+            class="alert alert-success"><?= Icon::get('check') ?> <?= Yii::t('MarketplaceModule.base', 'All modules are up to date!'); ?></div>
     <?php endif; ?>
 
     <?php foreach ($modules as $module): ?>
@@ -59,7 +60,7 @@ use yii\helpers\Url;
     <?php endforeach; ?>
 </div>
 
-<script>
+<script <?= Html::nonce(); ?>>
     $('#chkBeta').change(function () {
         $('#betaSwitchForm').submit();
     });

static/less/media.less

@@ -66,6 +66,7 @@
     .media-body {
         overflow: hidden !important;
         font-size: 13px;
+        word-break: break-all;
         h4.media-heading {
             font-size: 14px;
             font-weight: 500;