Merge branch 'upmerges/2025-11-11' of https://github.com/Bodge-IT/joomla-cms into upmerges/2025-11-11

Author: Bodge-IT

administrator/components/com_admin/sql/updates/mysql/6.0.1-2025-10-29.sql

@@ -0,0 +1,14 @@
+UPDATE `#__menu`
+SET `params` = JSON_SET(`params`,
+    JSON_UNQUOTE(JSON_SEARCH(`params`, 'one', ' ', NULL, '$.featured_categories[*]')),
+    ''
+    )
+WHERE JSON_VALID(`params`) = 1
+    AND JSON_SEARCH(`params`, 'one', ' ', NULL, '$.featured_categories[*]') IS NOT NULL
+    AND `type` = 'component'
+    AND `link` = 'index.php?option=com_content&view=featured';
+
+UPDATE `#__menu`
+SET `link` = REPLACE(`link`, '&catid[0]= ', '&catid[0]=')
+WHERE `type` = 'component'
+    AND `link` LIKE 'index.php?option=com_content&view=archive&catid[0]= %';

administrator/components/com_admin/sql/updates/postgresql/6.0.1-2025-10-29.sql

@@ -0,0 +1,21 @@
+UPDATE "#__menu"
+SET "params" = jsonb_set(
+    "params"::jsonb,
+    '{featured_categories}',
+    COALESCE(
+        (
+            SELECT jsonb_agg(to_jsonb(CASE WHEN elem = ' ' THEN '' ELSE elem END))
+            FROM jsonb_array_elements_text("params"::jsonb->'featured_categories') AS t(elem)
+        ),
+        '[]'::jsonb
+    ),
+    false
+)
+WHERE ("params"::jsonb->'featured_categories') @> '[" "]'::jsonb
+    AND "type" = 'component'
+    AND "link" = 'index.php?option=com_content&view=featured';
+
+UPDATE "#__menu"
+SET "link" = REPLACE("link", '&catid[0]= ', '&catid[0]=')
+WHERE "type" = 'component'
+    AND "link" LIKE 'index.php?option=com_content&view=archive&catid[0]= %';

components/com_content/tmpl/archive/default.xml

@@ -19,9 +19,9 @@
 				extension="com_content"
 				multiple="true"
 				layout="joomla.form.field.list-fancy-select"
-				default=" "
+				default=""
 				>
-				<option value=" ">JOPTION_ALL_CATEGORIES</option>
+				<option value="">JOPTION_ALL_CATEGORIES</option>
 			</field>
 		</fieldset>
 	</fields>

components/com_content/tmpl/featured/default.xml

@@ -19,10 +19,10 @@
 				extension="com_content"
 				multiple="true"
 				layout="joomla.form.field.list-fancy-select"
-				default=" "
+				default=""
 				parentclass="stack span-3"
 				>
-				<option value=" ">JOPTION_ALL_CATEGORIES</option>
+				<option value="">JOPTION_ALL_CATEGORIES</option>
 			</field>
 
 			<field