Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

Author: bembelimen

administrator/components/com_admin/script.php

@@ -5859,8 +5859,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/media/com_fields/js/admin-field-edit-modal.js',
 			'/media/com_fields/js/admin-field-edit-modal.min.js',
 			'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
-			// 4.0 from RC 2 to RC 3
+			// 4.0 from RC 3 to RC 4
 			'/components/com_contact/layouts/joomla/form/renderfield.php',
+			'/libraries/src/Http/Transport/cacert.pem'
 		);
 
 		$folders = array(

administrator/components/com_categories/tmpl/category/edit.php

@@ -15,6 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Workflow\WorkflowServiceInterface;
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
@@ -30,6 +31,17 @@
 
 // Fieldsets to not automatically render by /layouts/joomla/edit/params.php
 $this->ignore_fieldsets = ['jmetadata', 'item_associations'];
+
+$c = Factory::getApplication()->bootComponent($this->state->get('category.extension'));
+
+$wcontext = $c->getCategoryWorkflowContext($this->state->get('category.section'));
+
+if (!$c instanceof WorkflowServiceInterface
+	|| !$c->isWorkflowActive($wcontext))
+{
+	$this->ignore_fieldsets[] = 'workflow';
+}
+
 $this->useCoreUI = true;
 
 // In case of modal

administrator/components/com_content/src/Extension/ContentComponent.php

@@ -195,6 +195,22 @@ public function getWorkflowContexts(): array
 		return $contexts;
 	}
 
+	/**
+	 * Returns the workflow context based on the given category section
+	 *
+	 * @param   string  $section  The section
+	 *
+	 * @return  string|null
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCategoryWorkflowContext(?string $section = null): string
+	{
+		$context = $this->getWorkflowContexts();
+
+		return array_key_first($context);
+	}
+
 	/**
 	 * Returns the table for the count items functions for the given section.
 	 *

administrator/components/com_content/src/Helper/ContentHelper.php

@@ -15,6 +15,7 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Category;
+use Joomla\CMS\Workflow\WorkflowServiceInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 
@@ -97,6 +98,16 @@ public static function onPrepareForm(Form $form, $data)
 
 		$form->setFieldAttribute('workflow_id', 'default', 'inherit');
 
+		$component = Factory::getApplication()->bootComponent('com_content');
+
+		if (!$component instanceof WorkflowServiceInterface
+			|| !$component->isWorkflowActive('com_content.article'))
+		{
+			$form->removeField('workflow_id', 'params');
+
+			return;
+		}
+
 		$query = $db->getQuery(true);
 
 		$query->select($db->quoteName('title'))

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -1331,6 +1331,10 @@ public function getNonCoreExtensions()
 		foreach ($rows as $extension)
 		{
 			$decode = json_decode($extension->manifest_cache);
+
+			// Removed description so that CDATA content does not cause javascript error during pre-update check
+			$decode->description = '';
+
 			$this->translateExtensionName($extension);
 			$extension->version
 				= isset($decode->version) ? $decode->version : Text::_('COM_JOOMLAUPDATE_PREUPDATE_UNKNOWN_EXTENSION_MANIFESTCACHE_VERSION');
@@ -1348,7 +1352,7 @@ public function getNonCoreExtensions()
 	 *
 	 * @return  array  name,version,updateserver
 	 *
-	 * @since   4.0.0
+	 * @since   3.10.0
 	 */
 	public function getNonCorePlugins($folderFilter = array())
 	{
@@ -1387,6 +1391,10 @@ public function getNonCorePlugins($folderFilter = array())
 		foreach ($rows as $plugin)
 		{
 			$decode = json_decode($plugin->manifest_cache);
+
+			// Removed description so that CDATA content does not cause javascript error during pre-update check
+			$decode->description = '';
+
 			$this->translateExtensionName($plugin);
 			$plugin->version = $decode->version ?? Text::_('COM_JOOMLAUPDATE_PREUPDATE_UNKNOWN_EXTENSION_MANIFESTCACHE_VERSION');
 			unset($plugin->manifest_cache);

administrator/components/com_languages/tmpl/overrides/default.php

@@ -83,7 +83,7 @@
 									<?php endif; ?>
 								</th>
 								<td class="d-none d-md-table-cell">
-									<span id="string[<?php echo $this->escape($key); ?>]"><?php echo $this->escape($text); ?></span>
+									<span id="string[<?php echo $this->escape($key); ?>]"><?php echo HTMLHelper::_('string.truncate', $this->escape($text), 200); ?></span>
 								</td>
 								<td class="d-none d-md-table-cell">
 									<?php echo $language; ?>

administrator/components/com_media/config.xml

@@ -54,7 +54,7 @@
 			label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_LABEL"
 			description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_DESC"
 			size="50"
-			default="bmp,gif,jpg,jpeg,png,ico,mp3,mp4,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv"
+			default="bmp,gif,jpg,jpeg,png,webp,ico,mp3,mp4,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv"
 			showon="restrict_uploads:1"
 		/>
 

administrator/components/com_media/resources/scripts/components/browser/items/row.vue

@@ -71,7 +71,7 @@ export default {
       }
 
       // @todo remove the hardcoded extensions here
-      const extensionWithPreview = ['jpg', 'jpeg', 'png', 'gif', 'mp4', 'mp3', 'pdf'];
+      const extensionWithPreview = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'mp4', 'mp3', 'pdf'];
 
       // Show preview
       if (this.item.extension

administrator/components/com_menus/presets/help.xml

@@ -13,6 +13,7 @@
 		<menuitem
 			title="MOD_MENU_HELP_JOOMLA"
 			type="component"
+			element="com_admin"
 			link="index.php?option=com_admin&amp;view=help"
 		/>
 	</menuitem>
@@ -40,6 +41,7 @@
 		<menuitem
 			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM"
 			type="component"
+			element="com_admin"
 			target="_blank"
 			link="index.php?option=com_admin&amp;view=help&amp;layout=langforum"
 		/>

administrator/components/com_menus/tmpl/item/edit.php

@@ -133,11 +133,6 @@
 						$this->form->setFieldAttribute('publish_up', 'showon', '');
 						$this->form->setFieldAttribute('publish_down', 'showon', '');
 					}
-
-					if (!$isModal && $this->item->type == 'container')
-					{
-						echo $this->loadTemplate('container');
-					}
 					?>
 				<?php
 					// Set main fields.