Merge remote-tracking branch 'remote/5.1' into upmerge-5.1.9

# Conflicts: # CHANGELOG.md # composer.json # composer.lock # views/rss/page/default.php
jeabakker · Aug 2, 2024 · 450e203 · 450e203
2 parents 3edf702 + 50ba175
commit 450e203
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -93,6 +93,19 @@
 * **icons:** icontime metadata is no longer available [7e139b935](https://github.com/Elgg/Elgg/commit/7e139b9352908407bf48edec343c96fbf317df35)
 
 
+<a name="5.1.9"></a>
+### 5.1.9 (2024-08-02)
+
+#### Contributors
+
+* Jerôme Bakker (2)
+
+#### Bug fixes
+
+* **menus:** no longer render empty menu sections [72882fc37](https://github.com/Elgg/Elgg/commit/72882fc37325801d0a95370fe82f92495105a681)
+* **rss:** fatal error that occurred when enabling short_open_tag [d0883e534](https://github.com/Elgg/Elgg/commit/d0883e534f81f50a5837bae03f97386591000aab)
+
+
 <a name="5.1.8"></a>
 ### 5.1.8 (2024-07-11)
 

diff --git a/views/default/navigation/menu/elements/section.php b/views/default/navigation/menu/elements/section.php
@@ -39,10 +39,20 @@
 
 $lis = [];
 foreach ($items as $menu_item) {
-	$lis[] = elgg_view('navigation/menu/elements/item', [
+	$item = elgg_view('navigation/menu/elements/item', [
 		'item' => $menu_item,
 		'item_class' => $item_class,
 	]);
+
+	if (empty($item)) {
+		continue;
+	}
+
+	$lis[] = $item;
+}
+
+if (empty($lis)) {
+	return;
 }
 
 echo elgg_format_element('ul', $vars, implode(PHP_EOL, $lis));
diff --git a/views/rss/page/default.php b/views/rss/page/default.php
@@ -36,6 +36,8 @@
 elgg_set_http_header('Pragma: public');
 elgg_set_http_header('Content-Type: text/xml; charset=utf-8');
 
+// echo is needed because of PHP short tag support
+// https://www.php.net/manual/en/ini.core.php#ini.short-open-tag
 echo "<?xml version='1.0'?>";
 ?>
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:georss="http://www.georss.org/georss" xmlns:atom="http://www.w3.org/2005/Atom" <?= $namespaces; ?>>