Merge pull request #14483 from Elgg/5.x

upmerge 5.x into master

.readthedocs.yml

@@ -5,6 +5,11 @@
 # Required
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.7"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   builder: html
@@ -20,6 +25,5 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
   install:
     - requirements: docs/pip-requirements.txt

CHANGELOG.md

@@ -1,3 +1,31 @@
+<a name="5.0.7"></a>
+### 5.0.7  (2023-10-10)
+
+#### Contributors
+
+* Jeroen Dalsem (5)
+* Jerôme Bakker (2)
+
+#### Bug Fixes
+
+* **forms:** prevent double submit on comment forms ([1b057186](https://github.com/Elgg/Elgg/commit/1b057186899ceb119b461613f65ac4b1f82e9b3b))
+* **icons:** retry icon resize after failure ([e04e396b](https://github.com/Elgg/Elgg/commit/e04e396b428b850b173fbcc42f3ac4efeb4d08d1))
+
+
+<a name="5.0.6"></a>
+### 5.0.6  (2023-09-07)
+
+#### Contributors
+
+* Jerôme Bakker (2)
+* Nikolai Shcherbin (1)
+
+#### Bug Fixes
+
+* **ckeditor:** early abort object mentions on closing bracket ([b397601c](https://github.com/Elgg/Elgg/commit/b397601cd21212698c16e0ab00eb96d0e9f9679f))
+* **docs:** document correct function ([e9ba84a1](https://github.com/Elgg/Elgg/commit/e9ba84a15c4aeaeb9892ec252bdb5543135251fe))
+
+
 <a name="5.0.5"></a>
 ### 5.0.5  (2023-08-16)
 

actions/admin/site/icons.php

@@ -48,4 +48,4 @@
 	elgg_save_config('font_awesome_zip', $zip->getClientOriginalName());
 }
 
-return elgg_ok_response(elgg_echo('save:success'));
+return elgg_ok_response('', elgg_echo('save:success'));

actions/admin/site/theme.php

@@ -0,0 +1,34 @@
+<?php
+
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+$vars = (array) get_input('vars', [], false);
+$vars = array_filter($vars);
+
+$available_config = _elgg_services()->cssCompiler->getCssVars([], false);
+foreach ($vars as $name => $value) {
+	if (empty($value)) {
+		unset($vars[$name]);
+		continue;
+	}
+
+	if (!array_key_exists($name, $available_config)) {
+		unset($vars[$name]);
+		continue;
+	}
+
+	if (strtolower($value) === strtolower((string) $available_config[$name])) {
+		unset($vars[$name]);
+		continue;
+	}
+}
+
+if (empty($vars)) {
+	elgg_remove_config('custom_theme_vars');
+} else {
+	elgg_save_config('custom_theme_vars', $vars);
+}
+
+elgg_invalidate_caches();
+
+return elgg_ok_response('', elgg_echo('save:success'));

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "elgg/elgg",
-    "version": "5.0.5",
+    "version": "5.0.7",
     "description": "Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications.",
     "license": "GPL-2.0-only",
     "minimum-stability": "dev",
@@ -13,7 +13,7 @@
         "ext-json": "*",
         "ext-xml": "*",
         "ckeditor/ckeditor": "~4.20.0",
-        "composer/semver": "~3.3.0",
+        "composer/semver": "~3.4.0",
         "css-crush/css-crush": "~4.1.0",
         "doctrine/dbal": "~3.4.4",
         "eloquent/composer-config-reader": "~3.0.0",
@@ -41,7 +41,7 @@
         "npm-asset/requirejs": "^2.3.6",
         "npm-asset/requirejs-text": "^2.0.4",
         "npm-asset/sprintf-js": "~1.1.2",
-        "npm-asset/yaireo--tagify": "~4.16.0",
+        "npm-asset/yaireo--tagify": "~4.17.0",
         "pelago/emogrifier": "~7.0.0",
         "peppeocchi/php-cron-scheduler": "~4.0",
         "php-di/php-di": "~6.4.0",
@@ -54,7 +54,7 @@
         "symfony/mime": "~5.3",
         "symfony/routing": "~5.3",
         "symfony/var-dumper": "~5.3",
-        "vanilla/htmlawed": "~2.2.0"
+        "vanilla/htmlawed": "2.2.5"
     },
     "config": {
         "process-timeout": 0,