Merge branch 'master' into develop

CHANGELOG.md

@@ -1,14 +1,18 @@
 HumHub Changelog
 ================
 
-
 1.17.0 (TBA)
 ------------
 - Enh #7070: Add GitHub action for PHP CS Fixer
 - Enh #7073: Add a link to notification settings on top dropdown list
 
-1.16.1 (Unreleased)
-----------------------
+1.16.2 (Unreleased)
+---------------------
+- Fix #7102: Fix content search with word ending with hyphen
+- Fix #7104: Missing `--text-color-default` CSS variable
+
+1.16.1 (July 1, 2024)
+---------------------
 - Fix #7084: Fix compatibility for PHP 8.0+
 - Fix #7088: Improve handling of legacy configuration for "search" component
 - Fix #7089: Fix markdown sub list style

protected/humhub/config/common.php

@@ -26,7 +26,7 @@ if (!defined('PKCS7_DETACHED')) {
 
 $config = [
     'name' => 'HumHub',
-    'version' => '1.17.0',
+    'version' => '1.17.0-dev',
     'minRecommendedPhpVersion' => '8.1',
     'minSupportedPhpVersion' => '8.0',
     'basePath' => dirname(__DIR__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR,

protected/humhub/modules/content/search/driver/MysqlDriver.php

@@ -158,6 +158,9 @@ class MysqlDriver extends AbstractDriver
 
     protected function prepareTerm(string $term): string
     {
+        // Remove chars `-` to avoid mysql error
+        $term = preg_replace('/-+(\*?)$/', '$1', $term);
+
         // Wrap a keyword in quotes to avoid error with the special chars in the sql MATCH-AGAINST expression
         return preg_match('#[^\p{L}\d\*’\'`\-\_]#', $term) ? '"' . $term . '"' : $term;
     }

static/less/variables.less

@@ -100,47 +100,48 @@
 
 // CSS Variables
 :root {
-  // Colors for buttons status etc.
-  --default: @default;
-  --primary: @primary;
-  --info: @info;
-  --success: @success;
-  --warning: @warning;
-  --danger: @danger;
-  --link: @link;
+    // Colors for buttons status etc.
+    --default: @default;
+    --primary: @primary;
+    --info: @info;
+    --success: @success;
+    --warning: @warning;
+    --danger: @danger;
+    --link: @link;
 
-  // Text colors
-  --text-color-main: @text-color-main;
-  --text-color-secondary: @text-color-secondary;
-  --text-color-highlight: @text-color-highlight;
-  --text-color-soft: @text-color-soft;
-  --text-color-soft2: @text-color-soft2;
-  --text-color-soft3: @text-color-soft3;
-  --text-color-contrast: @text-color-contrast;
+    // Text colors
+    --text-color-main: @text-color-main;
+    --text-color-default: @text-color-default;
+    --text-color-secondary: @text-color-secondary;
+    --text-color-highlight: @text-color-highlight;
+    --text-color-soft: @text-color-soft;
+    --text-color-soft2: @text-color-soft2;
+    --text-color-soft3: @text-color-soft3;
+    --text-color-contrast: @text-color-contrast;
 
-  // Background colors
-  --background-color-main: @background-color-main;
-  --background-color-secondary: @background-color-secondary;
-  --background-color-page: @background-color-page;
-  --background-color-highlight: @background-color-highlight;
-  --background-color-highlight-soft: @background-color-highlight-soft;
-  --background3: @background3;
-  --background4: @background4;
+    // Background colors
+    --background-color-main: @background-color-main;
+    --background-color-secondary: @background-color-secondary;
+    --background-color-page: @background-color-page;
+    --background-color-highlight: @background-color-highlight;
+    --background-color-highlight-soft: @background-color-highlight-soft;
+    --background3: @background3;
+    --background4: @background4;
 
-  // Bootstrap Alert boxes
-  // Success
-  --background-color-success: @background-color-success;
-  --text-color-success: @text-color-success;
-  --border-color-success: @border-color-success;
-  // Warning
-  --background-color-warning: @background-color-warning;
-  --text-color-warning: @text-color-warning;
-  --border-color-warning: @border-color-warning;
-  // Danger
-  --background-color-danger: @background-color-danger;
-  --text-color-danger: @text-color-danger;
-  --border-color-danger: @border-color-danger;
+    // Bootstrap Alert boxes
+    // Success
+    --background-color-success: @background-color-success;
+    --text-color-success: @text-color-success;
+    --border-color-success: @border-color-success;
+    // Warning
+    --background-color-warning: @background-color-warning;
+    --text-color-warning: @text-color-warning;
+    --border-color-warning: @border-color-warning;
+    // Danger
+    --background-color-danger: @background-color-danger;
+    --text-color-danger: @text-color-danger;
+    --border-color-danger: @border-color-danger;
 
-  // Fonts
-  --mail-font-family: @mail-font-family;
+    // Fonts
+    --mail-font-family: @mail-font-family;
 }