Merge branch '4.1-dev' into 4.2-dev

joomla · Jun 7, 2022 · c297caa · c297caa
2 parents 2d40c7a + 793c4c2
commit c297caa
Show file tree

Hide file tree

Showing 35 changed files with 59 additions and 40 deletions.
diff --git a/administrator/components/com_associations/config.xml b/administrator/components/com_associations/config.xml
@@ -4,7 +4,7 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC" >
+		>
 		<field
 			name="rules"
 			type="rules"

diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
@@ -95,7 +95,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_cache/config.xml b/administrator/components/com_cache/config.xml
@@ -4,7 +4,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 		<field
 			name="rules"

diff --git a/administrator/components/com_checkin/config.xml b/administrator/components/com_checkin/config.xml
@@ -4,7 +4,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
@@ -1026,7 +1026,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 		<field
 			name="rules"

diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset addfieldprefix="Joomla\Component\Content\Administrator\Field">
 		<field
 			name="id"

diff --git a/administrator/components/com_content/src/View/Article/HtmlView.php b/administrator/components/com_content/src/View/Article/HtmlView.php
@@ -239,6 +239,9 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user)
 		}
 
 		$toolbar->divider();
+
+		ToolbarHelper::inlinehelp();
+
 		$toolbar->help('Articles:_Edit');
 	}
 }
diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
@@ -403,7 +403,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_installer/config.xml b/administrator/components/com_installer/config.xml
@@ -37,7 +37,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml
@@ -4,7 +4,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_mails/config.xml b/administrator/components/com_mails/config.xml
@@ -53,7 +53,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_mails/forms/template.xml b/administrator/components/com_mails/forms/template.xml
@@ -65,7 +65,7 @@
 				type="radio"
 				label="COM_MAILS_FIELD_ALTERNATIVE_MAILCONFIG_LABEL"
 				layout="joomla.form.field.radio.switcher"
-				default="1"
+				default="0"
 				filter="boolean"
 				>
 				<option value="0">JNO</option>

diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
@@ -131,7 +131,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_messages/config.xml b/administrator/components/com_messages/config.xml
@@ -4,7 +4,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml
@@ -415,7 +415,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_plugins/config.xml b/administrator/components/com_plugins/config.xml
@@ -4,7 +4,7 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC">
+		>
 
 		<field
 			name="rules"

diff --git a/administrator/components/com_postinstall/config.xml b/administrator/components/com_postinstall/config.xml
@@ -4,7 +4,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_redirect/config.xml b/administrator/components/com_redirect/config.xml
@@ -38,7 +38,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 		<field
 			name="rules"

diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
@@ -391,7 +391,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/components/com_templates/config.xml b/administrator/components/com_templates/config.xml
@@ -66,7 +66,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 		<field
 			name="rules"

diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
@@ -401,7 +401,6 @@
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
 		>
 
 		<field

diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
@@ -172,7 +172,7 @@ COM_INSTALLER_MSG_UPDATESITES_DELETE_ERROR="An error has occurred while trying t
 COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED="%s update sites have been deleted."
 COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED_1="Update site has been deleted."
 COM_INSTALLER_MSG_UPDATESITES_REBUILD_EXTENSION_PLUGIN_NOT_ENABLED="The <a href=\"%s\">Joomla Extension Plugin</a> is disabled. This plugin must be enabled to rebuild the update sites."
-COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE="Update sites have been rebuilt. No extension with an update site has been discovered."
+COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE="Update sites have been rebuilt. No additional extension with an update site has been discovered."
 COM_INSTALLER_MSG_UPDATESITES_REBUILD_NOT_PERMITTED="Rebuilding update sites is not permitted."
 COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt from manifest files."
 COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered."

diff --git a/administrator/manifests/packages/pkg_search.xml b/administrator/manifests/packages/pkg_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<extension type="package" version="4.0" method="upgrade">
+<extension type="package" method="upgrade">
 	<name>pkg_search</name>
 	<packagename>search</packagename>
 	<creationDate>2021-08-17</creationDate>

diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss
@@ -140,6 +140,7 @@ fieldset {
 .com-users-profile__edit,
 .com-users-registration {
   #jform_privacyconsent_privacy,
+  #jform_profile_tos,
   #jform_terms_terms {
     .radio {
       display: inline-flex;

diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
@@ -200,7 +200,7 @@ public function send()
 		$params = $mail->params;
 		$app    = Factory::getApplication();
 
-		if ($config->get('alternative_mailconfig'))
+		if ((int) $config->get('alternative_mailconfig', 0) === 1 && (int) $params->get('alternative_mailconfig', 0) === 1)
 		{
 			if ($this->mailer->Mailer === 'smtp' || $params->get('mailer') === 'smtp')
 			{

diff --git a/package.json b/package.json
@@ -7,9 +7,10 @@
     "type": "git",
     "url": "https://github.com/joomla/joomla-cms.git"
   },
+  "__engines_upgrades__": "Dockerfiles @ github.com/joomla-projects/docker-images need also upgrade",
   "engines": {
     "node": ">=16",
-    "npm": ">=8.6.0"
+    "npm": ">=8.5.5"
   },
   "scripts": {
     "build:js": "node build/build.js --compile-js",

diff --git a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
@@ -84,19 +84,34 @@ public function onDisplay(
 		$editor .= !$this->app->client->mobile ? LayoutHelper::render('joomla.tinymce.togglebutton') : '';
 		$editor .= '</div>';
 
-		// Prepare the instance specific options, actually the ext-buttons
-		if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons']))
+		// Prepare the instance specific options
+		if (empty($options['tinyMCE'][$fieldName]))
 		{
-			$btns = $this->tinyButtons($id, $buttons);
+			// Width and height
+			if ($width)
+			{
+				$options['tinyMCE'][$fieldName]['width'] = $width;
+			}
+
+			if ($height)
+			{
+				$options['tinyMCE'][$fieldName]['height'] = $height;
+			}
 
 			// Set editor to readonly mode
 			if (!empty($params['readonly']))
 			{
 				$options['tinyMCE'][$fieldName]['readonly'] = 1;
 			}
 
-			$options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true;
-			$options['tinyMCE'][$fieldName]['joomlaExtButtons']    = $btns;
+			// The ext-buttons
+			if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons']))
+			{
+				$btns = $this->tinyButtons($id, $buttons);
+
+				$options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true;
+				$options['tinyMCE'][$fieldName]['joomlaExtButtons']    = $btns;
+			}
 
 			$doc->addScriptOptions('plg_editor_tinymce', $options, false);
 		}
@@ -471,8 +486,8 @@ public function onDisplay(
 				'document_base_url'  => Uri::root(true) . '/',
 				'image_caption'      => true,
 				'importcss_append'   => true,
-				'height'             => $height ?: $this->params->get('html_height', '550px'),
-				'width'              => $width ?: $this->params->get('html_width', ''),
+				'height'             => $this->params->get('html_height', '550px'),
+				'width'              => $this->params->get('html_width', ''),
 				'elementpath'        => (bool) $levelParams->get('element_path', true),
 				'resize'             => $resizing,
 				'templates'          => $templates,

diff --git a/plugins/system/schedulerunner/schedulerunner.php b/plugins/system/schedulerunner/schedulerunner.php
@@ -374,8 +374,7 @@ public function generateWebcronKey(EventInterface $event): void
 		/** @var Extension $table */
 		[$context, $table] = $event->getArguments();
 
-		if ($context !== 'com_config.component'
-			|| ($table->name ?? '') !== 'COM_SCHEDULER')
+		if ($context !== 'com_config.component' || $table->name !== 'com_scheduler')
 		{
 			return;
 		}

diff --git a/plugins/system/schedulerunner/schedulerunner.xml b/plugins/system/schedulerunner/schedulerunner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<extension version="4.1" type="plugin" group="system" method="upgrade">
+<extension type="plugin" group="system" method="upgrade">
 	<name>plg_system_schedulerunner</name>
 	<author>Joomla! Project</author>
 	<creationDate>2021-08</creationDate>

diff --git a/plugins/system/tasknotification/tasknotification.xml b/plugins/system/tasknotification/tasknotification.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<extension version="4.1" type="plugin" group="system" method="upgrade">
+<extension type="plugin" group="system" method="upgrade">
 	<name>plg_system_task_notification</name>
 	<author>Joomla! Project</author>
 	<creationDate>2021-09</creationDate>

diff --git a/plugins/task/checkfiles/checkfiles.xml b/plugins/task/checkfiles/checkfiles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<extension version="4.1" type="plugin" group="task" method="upgrade">
+<extension type="plugin" group="task" method="upgrade">
 	<name>plg_task_check_files</name>
 	<author>Joomla! Project</author>
 	<creationDate>2021-08</creationDate>

diff --git a/plugins/task/demotasks/demotasks.xml b/plugins/task/demotasks/demotasks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<extension version="4.1" type="plugin" group="task" method="upgrade">
+<extension type="plugin" group="task" method="upgrade">
 	<name>plg_task_demo_tasks</name>
 	<author>Joomla! Project</author>
 	<creationDate>2021-07</creationDate>

diff --git a/plugins/task/requests/requests.xml b/plugins/task/requests/requests.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<extension version="4.1" type="plugin" group="task" method="upgrade">
+<extension type="plugin" group="task" method="upgrade">
 	<name>plg_task_requests</name>
 	<author>Joomla! Project</author>
 	<creationDate>2021-08</creationDate>

diff --git a/plugins/task/sitestatus/sitestatus.xml b/plugins/task/sitestatus/sitestatus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<extension version="4.1" type="plugin" group="task" method="upgrade">
+<extension type="plugin" group="task" method="upgrade">
 	<name>plg_task_site_status</name>
 	<author>Joomla! Project</author>
 	<creationDate>2021-08</creationDate>

diff --git a/templates/cassiopeia/html/mod_custom/banner.php b/templates/cassiopeia/html/mod_custom/banner.php
@@ -8,10 +8,23 @@
  */
 
 defined('_JEXEC') or die;
-?>
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Uri\Uri;
+
+$modId = 'mod-custom' . $module->id;
+
+if ($params->get('backgroundimage'))
+{
+	/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+	$wa = $app->getDocument()->getWebAssetManager();
+	$wa->addInlineStyle('
+#' . $modId . '{background-image: url("' . Uri::root(true) . '/' . HTMLHelper::_('cleanImageURL', $params->get('backgroundimage'))->url . '");}
+', ['name' => $modId]);
+}
+?>
 
-<div class="mod-custom custom banner-overlay" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
+<div class="mod-custom custom banner-overlay" id="<?php echo $modId; ?>">
 	<div class="overlay">
 		<?php echo $module->content; ?>
 	</div>