Merge branch '4.1-dev' into patch-7

administrator/components/com_finder/src/Field/ContenttypesField.php

@@ -60,7 +60,7 @@ public function getOptions()
 		}
 		catch (\RuntimeException $e)
 		{
-			Factory::getApplication()->enqueueMessage($db->getMessage(), 'error');
+			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 		}
 
 		// Translate.

administrator/components/com_finder/src/Service/HTML/Finder.php

@@ -89,7 +89,7 @@ public function mapslist()
 		}
 		catch (\RuntimeException $e)
 		{
-			Factory::getApplication()->enqueueMessage($db->getMessage(), 'error');
+			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 		}
 
 		// Translate.

administrator/components/com_installer/src/Table/UpdatesiteTable.php

@@ -21,6 +21,15 @@
  */
 class UpdatesiteTable extends Table
 {
+	/**
+	 * Indicates that columns fully support the NULL value in the database
+	 *
+	 * @var    boolean
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_supportNullValue = true;
+
 	/**
 	 * Constructor
 	 *

administrator/components/com_mails/tmpl/template/edit.php

@@ -44,7 +44,9 @@
 			<div class="col-md-12">
 				<h1><?php echo Text::_($component . '_MAIL_' . $sub_id . '_TITLE'); ?> - <?php echo $this->escape($this->item->language); ?>
 				</h1>
-				<div class="small"><?php echo $this->escape($this->master->template_id); ?></div>
+				<div class="small mb-1">
+					<span class="badge bg-secondary"><?php echo $this->escape($this->master->template_id); ?></span>
+				</div>
 				<p><?php echo Text::_($component . '_MAIL_' . $sub_id . '_DESC'); ?></p>
 			</div>
 		</div>

administrator/components/com_media/src/Provider/ProviderManagerHelperTrait.php

@@ -16,8 +16,6 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;
 use Joomla\Component\Media\Administrator\Event\MediaProviderEvent;
-use Joomla\Component\Media\Administrator\Provider\ProviderInterface;
-use Joomla\Component\Media\Administrator\Provider\ProviderManager;
 
 /**
  * Trait for classes that need adapters.

administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php

@@ -60,7 +60,7 @@ protected function getOptions()
 		}
 		catch (\RuntimeException $e)
 		{
-			Factory::getApplication()->enqueueMessage($db->getMessage(), 'error');
+			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 		}
 
 		// Merge any additional options in the XML definition.

administrator/components/com_scheduler/forms/filter_tasks.xml

@@ -50,18 +50,18 @@
 			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
-			<option value="a.state ASC">JSTATUS_ASC</option>
-			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
 			<option value="j.type_title ASC">COM_SCHEDULER_TASK_TYPE_ASC</option>
 			<option value="j.type_title DESC">COM_SCHEDULER_TASK_TYPE_DESC</option>
-			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
-			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 			<option value="a.priority ASC">COM_SCHEDULER_TASK_PRIORITY_ASC</option>
 			<option value="a.priority DESC">COM_SCHEDULER_TASK_PRIORITY_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
 		<field
 			name="limit"

administrator/components/com_scheduler/src/Model/TasksModel.php

@@ -122,7 +122,7 @@ protected function getListQuery(): QueryInterface
 			$this->getState(
 				'list.select',
 				'a.id, a.asset_id, a.title, a.type, a.execution_rules, a.state, a.last_exit_code, a.locked' .
-				', a.last_execution, a.next_execution, a.times_executed, a.times_failed, a.ordering, a.note'
+				', a.last_execution, a.next_execution, a.times_executed, a.times_failed, a.priority, a.ordering, a.note'
 			)
 		);
 

administrator/components/com_scheduler/tmpl/tasks/default.php

@@ -135,6 +135,11 @@ class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('COM_SCHEDULER_TEST_TASK'); ?>
 					</th>
 
+					<!-- Priority -->
+					<th scope="col">
+						<?php echo HTMLHelper::_('searchtools.sort', 'COM_SCHEDULER_TASK_PRIORITY', 'a.priority', $listDirn, $listOrder) ?>
+					</th>
+
 					<!-- Task ID -->
 					<th scope="col" class="w-5 d-none d-md-table-cell">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
@@ -231,6 +236,17 @@ class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="
 							</button>
 						</td>
 
+						<!-- Priority -->
+						<td class="small d-none d-lg-table-cell">
+							<?php if ($item->priority === -1) : ?>
+								<span class="badge bg-info"><?php echo Text::_('COM_SCHEDULER_LABEL_TASK_PRIORITY_LOW'); ?></span>
+							<?php elseif ($item->priority === 0) : ?>
+								<span class="badge bg-success"><?php echo Text::_('COM_SCHEDULER_LABEL_TASK_PRIORITY_NORMAL'); ?></span>
+							<?php elseif ($item->priority === 1) : ?>
+								<span class="badge bg-danger"><?php echo Text::_('COM_SCHEDULER_LABEL_TASK_PRIORITY_HIGH'); ?></span>
+							<?php endif; ?>
+						</td>
+
 						<!-- Item ID -->
 						<td class="d-none d-md-table-cell">
 							<?php echo (int) $item->id; ?>

administrator/language/en-GB/com_messages.ini

@@ -46,7 +46,7 @@ COM_MESSAGES_HEADING_SUBJECT_ASC="Subject ascending"
 COM_MESSAGES_HEADING_SUBJECT_DESC="Subject descending"
 COM_MESSAGES_INVALID_REPLY_ID="Invalid recipient"
 COM_MESSAGES_MANAGER_MESSAGES="Private Messages"
-COM_MESSAGES_MAIL_NEW_MESSAGE_DESC="Notification about a new message in the messaging component."
+COM_MESSAGES_MAIL_NEW_MESSAGE_DESC="Email containing a message created in the messaging component."
 COM_MESSAGES_MAIL_NEW_MESSAGE_TITLE="Messages: New message"
 COM_MESSAGES_MARK_AS_READ="Mark as Read"
 COM_MESSAGES_MARK_AS_UNREAD="Mark as Unread"
@@ -58,8 +58,8 @@ COM_MESSAGES_N_ITEMS_TRASHED="%d messages trashed."
 COM_MESSAGES_N_ITEMS_TRASHED_1="Message trashed."
 COM_MESSAGES_N_ITEMS_UNPUBLISHED="%d messages marked as unread."
 COM_MESSAGES_N_ITEMS_UNPUBLISHED_1="Message marked as unread."
-COM_MESSAGES_NEW_MESSAGE="New Message from {FROMNAME} at {SITENAME}"
-COM_MESSAGES_NEW_MESSAGE_BODY="{SUBJECT} \n\n{MESSAGE}"
+COM_MESSAGES_NEW_MESSAGE="[{SITENAME}] - {SUBJECT}"
+COM_MESSAGES_NEW_MESSAGE_BODY="{MESSAGE}"
 COM_MESSAGES_NO_ITEM_SELECTED="No messages selected."
 COM_MESSAGES_OPTION_READ="Read"
 COM_MESSAGES_OPTION_UNREAD="Unread"

administrator/language/en-GB/com_scheduler.ini

@@ -118,12 +118,13 @@ COM_SCHEDULER_TASK="Task"
 COM_SCHEDULER_TASKS_VIEW_DEFAULT_DESC="Schedule and Manage Task Routines."
 COM_SCHEDULER_TASKS_VIEW_DEFAULT_TITLE="Scheduled Tasks"
 COM_SCHEDULER_TASK_PARAMS_FIELDSET_LABEL="Task Parameters"
+COM_SCHEDULER_TASK_PRIORITY="Task Priority"
 COM_SCHEDULER_TASK_PRIORITY_ASC="Task Priority ascending"
 COM_SCHEDULER_TASK_PRIORITY_DESC="Task Priority descending"
 COM_SCHEDULER_TASK_ROUTINE_EXCEPTION="Routine threw exception: %1$s"
 COM_SCHEDULER_TASK_TYPE="Task Type"
-COM_SCHEDULER_TASK_TYPE_ASC="Task type ascending"
-COM_SCHEDULER_TASK_TYPE_DESC="Task type descending"
+COM_SCHEDULER_TASK_TYPE_ASC="Task Type ascending"
+COM_SCHEDULER_TASK_TYPE_DESC="Task Type descending"
 COM_SCHEDULER_TEST_RUN="Run Test"
 COM_SCHEDULER_TEST_RUN_DURATION="Duration: %s seconds"
 COM_SCHEDULER_TEST_RUN_OUTPUT="Output:<br>%s"

administrator/language/en-GB/plg_system_jooa11y.ini

@@ -5,11 +5,11 @@
 
 PLG_SYSTEM_JOOA11Y="System - Joomla Accessibility Checker"
 PLG_SYSTEM_JOOA11Y_FIELD_CHECK_ROOT="Content Container"
-PLG_SYSTEM_JOOA11Y_FIELD_CHECK_ROOT_DESC="Aria Landmark on the page that will be checked for accessibility. The default setting is <strong>main</strong>."
+PLG_SYSTEM_JOOA11Y_FIELD_CHECK_ROOT_DESC="Landmark on the page that will be checked for accessibility. The default setting is the landmark <strong>main</strong>. Alternatives to landmarks are classes, elements or ARIA roles (eg #example, .example, [role=example])."
 PLG_SYSTEM_JOOA11Y_FIELD_CONTAINER_IGNORE="Ignore Regions"
-PLG_SYSTEM_JOOA11Y_FIELD_CONTAINER_IGNORE_DESC="Ignore specific regions within the Content Container. Use commas to separate classes or elements (eg #ignore, .ignore)"
+PLG_SYSTEM_JOOA11Y_FIELD_CONTAINER_IGNORE_DESC="Ignore specific regions within the Content Container. Use commas to separate classes or elements (eg #ignore, .ignore)."
 PLG_SYSTEM_JOOA11Y_FIELD_READABILITY_ROOT="Readability Container"
-PLG_SYSTEM_JOOA11Y_FIELD_READABILITY_ROOT_DESC="Aria Landmark on the page that will be checked for readability. The default setting is <strong>main</strong>."
+PLG_SYSTEM_JOOA11Y_FIELD_READABILITY_ROOT_DESC="Landmark on the page that will be checked for readability. The default setting is the landmark <strong>main</strong>. Alternatives to landmarks are classes, elements or ARIA roles (eg #example, .example, [role=example])."
 PLG_SYSTEM_JOOA11Y_FIELD_SHOW_ALWAYS="Show Always"
 PLG_SYSTEM_JOOA11Y_FIELD_SHOW_ALWAYS_DESC="Load the accessiblity checker on all pages. This is useful when developing the website but should not be left on when the website is live."
 PLG_SYSTEM_JOOA11Y_XML_DESCRIPTION="The Joomla Accessibility Checker visually highlights common accessibility and usability issues. Geared towards content authors, the plugin identifies errors or warnings and provides guidance on how to fix them."

administrator/modules/mod_submenu/src/Menu/Menu.php

@@ -156,7 +156,7 @@ public static function preprocess($parent)
 					$createFields = ComponentHelper::getParams(strstr($query['context'], '.', true))->get('custom_fields_enable', 1);
 				}
 
-				if (!$createFields)
+				if (!$createFields || !$user->authorise('core.manage', 'com_users'))
 				{
 					$parent->removeChild($item);
 					continue;

build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss

@@ -59,7 +59,7 @@
       font-weight: $medium-weight;
     }
 
-    a:not(.badge) {
+    a:not(.badge):not(.btn):not(.dropdown-item) {
       text-decoration: underline;
     }
   }

build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss

@@ -180,10 +180,3 @@
     }
   }
 }
-
-// In Microsoft Edge, sticky positioning doesn't work when combined with dir "rtl" attribute
-@supports (-ms-ime-align: auto) {
-  [dir=rtl] .subhead {
-    position: relative;
-  }
-}

components/com_contact/src/Model/CategoryModel.php

@@ -292,7 +292,7 @@ protected function populateState($ordering = null, $direction = null)
 		else
 		{
 			$limit = $app->getUserStateFromRequest(
-				'com_contact.category.list',
+				'com_contact.category.list.limit',
 				'limit',
 				$mergedParams->get('contacts_display_num', $app->get('list_limit')),
 				'uint'

components/com_privacy/src/Model/ConfirmModel.php

@@ -16,7 +16,6 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogModel;

components/com_privacy/src/Model/RequestModel.php

@@ -19,7 +19,6 @@
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserHelper;

layouts/plugins/editors/tinymce/field/tinymcebuilder.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 

libraries/src/Access/Access.php

@@ -1045,7 +1045,7 @@ public static function getAuthorisedViewLevels($userId)
 				}
 			}
 
-			return array_unique($authorised);
+			return array_values(array_unique($authorised));
 		}
 
 		// Get all groups that the user is mapped to recursively.
@@ -1070,7 +1070,7 @@ public static function getAuthorisedViewLevels($userId)
 			}
 		}
 
-		return array_unique($authorised);
+		return array_values(array_unique($authorised));
 	}
 
 	/**

plugins/actionlog/joomla/joomla.php

@@ -992,7 +992,7 @@ public function onAfterCheckin($table)
 			'userid'      => $user->id,
 			'username'    => $user->username,
 			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
-			'table'       => $table,
+			'table'       => str_replace($this->db->getPrefix(), '#__', $table),
 		);
 
 		$this->addLog(array($message), 'PLG_ACTIONLOG_JOOMLA_USER_CHECKIN', $context, $user->id);

plugins/editors/codemirror/codemirror.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_codemirror</name>
-	<version>5.65.1</version>
+	<version>5.65.2</version>
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>

plugins/editors/tinymce/src/PluginTraits/ResolveFiles.php

@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Plugin\Editors\TinyMCE\PluginTraits\ActiveSiteTemplate;
 
 /**
  * Handles the editor.css files.

plugins/fields/checkboxes/params/checkboxes.xml

@@ -15,6 +15,7 @@
 						name="name"
 						type="text"
 						label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_NAME_LABEL"
+						required="true"
 					/>
 
 					<field

plugins/fields/list/params/list.xml

@@ -27,6 +27,7 @@
 						name="name"
 						type="text"
 						label="PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL"
+						required="true"
 					/>
 
 					<field

plugins/fields/radio/params/radio.xml

@@ -15,6 +15,7 @@
 						name="name"
 						type="text"
 						label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_NAME_LABEL"
+						required="true"
 					/>
 
 					<field

plugins/system/jooa11y/jooa11y.php

@@ -123,6 +123,16 @@ public function initJooa11y()
 		// Detect the current active language
 		$lang = Factory::getLanguage()->getTag();
 
+		// Add plugin settings from the xml
+		$document->addScriptOptions(
+			'jooa11yOptions',
+			[
+				'checkRoot'       => $this->params->get('checkRoot', 'main'),
+				'readabilityRoot' => $this->params->get('readabilityRoot', 'main'),
+				'containerIgnore' => $this->params->get('containerIgnore'),
+			]
+		);
+
 		// Add the language constants
 		$constants = [
 			'PLG_SYSTEM_JOOA11Y_ALERT_CLOSE',