Merge branch '4.1-dev' into j4/mce/paste

administrator/language/en-GB/com_config.ini

@@ -59,28 +59,28 @@ COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name"
 COM_CONFIG_FIELD_DATABASE_PASSWORD_DESC="Do not edit this field unless absolutely necessary (eg after the transfer of the database to a new hosting provider)."
 COM_CONFIG_FIELD_DATABASE_PASSWORD_LABEL="Database Password"
 COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix"
-COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type"
 COM_CONFIG_FIELD_DATABASE_TYPE_DESC="Do not change this to a different database technology e.g. from MySQLi (MySQL database technology) to PostgreSQL (Postgres database technology); it will break your site."
+COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type"
 COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
 COM_CONFIG_FIELD_DEBUG_CONST="Constant"
 COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC="Select if you should display the language constant or the language value when debugging the language strings."
 COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL="Language Display"
-COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
 COM_CONFIG_FIELD_DEBUG_LANG_DESC="Displays <strong><code>??</code></strong> around a language string constant when the string is not present in the currently loaded language files or <strong><code>**</code></strong> around the string value when the string is present. If none of the above is displayed, it could mean the text is hardcoded and needs a language string."
-COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
+COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
 COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="Use it only for troubleshooting, ideally on <em>private</em> copies of your site. The more technical information displayed in this mode can be a security risk if left enabled on live sites. Remember to publish the “System - Debug” plugin to get detailed information on each page being loaded."
+COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
 COM_CONFIG_FIELD_DEBUG_VALUE="Value"
-COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the Access Level which will be assigned by default to newly created items."
-COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
+COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
 COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Joomla and third party extensions can use a <a href=\"https://en.wikipedia.org/wiki/CAPTCHA\" target=\"_blank\">CAPTCHA</a> to prevent abuse (spam) on public forms. Each extension can choose to use a different CAPTCHA, if more than one are available. If no selection is made this will be used by default. You can enable additional CAPTCHA methods in System, Manage, Plugins."
-COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
+COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
 COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC="This editor will be used for editing content and other rich text areas in third party extensions unless a user has chosen a different one in their user profile . This will also be the only editor available and used for users who are not already logged in (the Guest user group)."
-COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL="Default Feed Limit"
+COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
 COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC="How many items will be published by default in RSS and Atom feeds."
+COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL="Default Feed Limit"
 COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
-COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting"
 COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Control whether PHP error messages should be displayed at all and how verbose they will be. On live sites use None for security reasons. Only use Maximum while troubleshooting — remember to set that back to None when you're done!"
+COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting"
 COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed Email Address"
 COM_CONFIG_FIELD_FILESYSTEM_PATH_DESC="The filesystem path where session data will be stored.<br>If empty, the system's temporary directory will be used."
 COM_CONFIG_FIELD_FILESYSTEM_PATH_LABEL="Session Save Path"
@@ -91,10 +91,10 @@ COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML"
 COM_CONFIG_FIELD_FILTERS_ALLOWED_LIST="Allowed List"
 COM_CONFIG_FIELD_FLOC_BLOCKER_DESC="Send a header to not support the tracking through the FLoC method."
 COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL="Block FLoC"
-COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_FORCE_SSL_DESC="HTTPS must be enabled on your server or load balancer to utilise this option. Enable 'Behind Load Balancer' if your SSL terminates on your load balancer but your site is served on http on its webserver."
-COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
+COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Joomla can automatically compress the generated HTML pages with GZip, making them smaller and increasing your site's speed score. Disable it if your server is already doing that for you or if it conflicts with third party extensions."
+COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
 COM_CONFIG_FIELD_HTMLBODY_LABEL="HTML Body"
 COM_CONFIG_FIELD_LOADBALANCER_ENABLE_DESC="If your site is behind a load balancer or reverse proxy, enable this setting so that IP addresses and other configurations within Joomla automatically take this into account."
 COM_CONFIG_FIELD_LOADBALANCER_ENABLE_LABEL="Behind Load Balancer"
@@ -104,10 +104,10 @@ COM_CONFIG_FIELD_LOG_CATEGORY_MODE_EXCLUDE="Exclude"
 COM_CONFIG_FIELD_LOG_CATEGORY_MODE_INCLUDE="Include"
 COM_CONFIG_FIELD_LOG_CATEGORY_MODE_LABEL="Log Category Mode"
 COM_CONFIG_FIELD_LOG_DEPRECATED_LABEL="Log Deprecated API"
-COM_CONFIG_FIELD_LOG_EVERYTHING_LABEL="Log Almost Everything"
 COM_CONFIG_FIELD_LOG_EVERYTHING_DESC="Logs everything, except deprecated APIs."
-COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
+COM_CONFIG_FIELD_LOG_EVERYTHING_LABEL="Log Almost Everything"
 COM_CONFIG_FIELD_LOG_PATH_DESC="Joomla can optionally keep a log file of its own and third party extensions' operations. Provide the absolute path to a folder that is writeable by PHP; if it's missing or is not writeable Joomla will not load at all. For security reasons you must not use a folder with system–wide access such as <code>/tmp</code>."
+COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
 COM_CONFIG_FIELD_LOG_PRIORITIES_ALERT="Alert"
 COM_CONFIG_FIELD_LOG_PRIORITIES_ALL="All"
 COM_CONFIG_FIELD_LOG_PRIORITIES_CRITICAL="Critical"
@@ -122,8 +122,8 @@ COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From Email"
 COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
 COM_CONFIG_FIELD_MAIL_MAILER_LABEL="Mailer"
 COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL="Send Mail"
-COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL="Disable Mass Mail"
 COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC="Joomla offers a Mass Mail feature which allows a user with administrator access to send an email to all users of the site. On sites with more than a few dozen users this can be problematic or time out."
+COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL="Disable Mass Mail"
 COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL="Reply To Email"
 COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL="Reply To Name"
 COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL="Sendmail Path"
@@ -139,33 +139,33 @@ COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL="Persistent Memcache(d)"
 COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache(d) Server Port"
 COM_CONFIG_FIELD_METAAUTHOR_LABEL="Author Meta Tag"
 COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description"
-COM_CONFIG_FIELD_METAVERSION_LABEL="Joomla Version"
 COM_CONFIG_FIELD_METAVERSION_DESC="Controls whether the <code>generator</code> meta tag in the HTML document's header in the front-end and in Atom feeds includes the exact version of your Joomla site. It is recommended to hide it for security reasons."
+COM_CONFIG_FIELD_METAVERSION_LABEL="Joomla Version"
 COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL="Offline Image"
 COM_CONFIG_FIELD_OFFLINE_MESSAGE_LABEL="Custom Message"
-COM_CONFIG_FIELD_PROXY_ENABLE_LABEL="Enable Outbound Proxy"
 COM_CONFIG_FIELD_PROXY_ENABLE_DESC="Some hosts do not allow any network access from your site to the outside world by default and require you to manually configure an outbound proxy."
-COM_CONFIG_FIELD_PROXY_HOST_LABEL="Outbound Proxy Host"
+COM_CONFIG_FIELD_PROXY_ENABLE_LABEL="Enable Outbound Proxy"
 COM_CONFIG_FIELD_PROXY_HOST_DESC="Host (domain) name or IP address."
+COM_CONFIG_FIELD_PROXY_HOST_LABEL="Outbound Proxy Host"
 COM_CONFIG_FIELD_PROXY_PASSWORD_LABEL="Outbound Proxy Password"
 COM_CONFIG_FIELD_PROXY_PORT_LABEL="Outbound Proxy Port"
-COM_CONFIG_FIELD_PROXY_USERNAME_LABEL="Outbound Proxy Username"
 COM_CONFIG_FIELD_PROXY_USERNAME_DESC="Leave blank if your outbound proxy does not require authentication."
+COM_CONFIG_FIELD_PROXY_USERNAME_LABEL="Outbound Proxy Username"
 COM_CONFIG_FIELD_REDIS_AUTH_LABEL="Redis Server Authentication"
 COM_CONFIG_FIELD_REDIS_DB_LABEL="Redis Database"
 COM_CONFIG_FIELD_REDIS_HOST_LABEL="Redis Server Host/Sock"
 COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
 COM_CONFIG_FIELD_REDIS_PORT_DESC="Port discarded if connecting to Redis server over Unix sockets."
 COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
 COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
-COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the <code>index.php/</code> part from the URLs."
-COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
+COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are “bare”, without an extension. This options tells Joomla to add an extension such as <code>.html</code>, <code>.feed</code> etc based on the type of content being displayed by the URL."
-COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
+COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
 COM_CONFIG_FIELD_SEF_URL_DESC="Joomla URLs normally look like <code>index.php?option=com_example&task=item.display&id=1</code> which isn't easy to convey verbally or in writing. Search Engine Friendly (SEF) URLs are more human–readable, e.g. <code>index.php/example/display/something</code>."
-COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Website Time Zone"
+COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
 COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Used by default to display dates and times (Joomla stores them internally as UTC). This can be different than the time zone of your server. Users can override their preferred time zone in their user profile."
+COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Website Time Zone"
 COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler"
 COM_CONFIG_FIELD_SESSION_METADATA_DESC="If enabled, additional metadata about a user's session (including their username, user ID, and which application they are logged into) will be logged to the session database table.<br>If disabled, features dependent on this data will be unavailable."
 COM_CONFIG_FIELD_SESSION_METADATA_LABEL="Track Session Metadata"
@@ -177,10 +177,10 @@ COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
 COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
 COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Site Name in Page Titles"
 COM_CONFIG_FIELD_SUBJECT_LABEL="Subject"
-COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder"
 COM_CONFIG_FIELD_TEMP_PATH_DESC="Joomla needs to temporarily store some files to perform actions such as installing / updating extensions or uploading files. Enter the absolute path of a directory that is writeable be PHP. <em>Do not</em> use the system–wide temporary folder (e.g. <code>/tmp</code>) for security reasons."
-COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases"
+COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder"
 COM_CONFIG_FIELD_UNICODESLUGS_DESC="No: Joomla transliterates aliases which contain non–latin-1 characters using the transliteration engine provided by the Joomla language pack for the content's selected language, e.g. über becomes ueber for en-GB (English, Great Britain). Yes: Joomla does not transliterate aliases; the alias is used as is, e.g. über remains as–is."
+COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases"
 COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY="Administrator Only"
 COM_CONFIG_FIELD_VALUE_AFTER="After"
 COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL="Author Email"
@@ -209,8 +209,8 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_METHODS_DESC="Specifies the Web service
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowed to access Web services on this site, sent back in response to a preflight request. Default: * (=all)."
 COM_CONFIG_FIELDSET_TAGS_LABEL="Tags"
 COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -"
-COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing"
 COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to “None” to disable this feature."
+COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing"
 COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus"
 COM_CONFIG_FRONTEDITING_MODULES="Modules"
 COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration"

administrator/language/en-GB/plg_task_sitestatus.ini

@@ -10,7 +10,7 @@ PLG_TASK_SITE_STATUS_ERROR_CONFIGURATION_PHP_NOTWRITABLE="Could not make configu
 PLG_TASK_SITE_STATUS_ERROR_WRITE_FAILED="Could not write to the configuration file!"
 PLG_TASK_SITE_STATUS_ROUTINE_END_LOG_MESSAGE="ToggleOffline return code is: %1$d. Processing Time: %2$.2f seconds."
 PLG_TASK_SITE_STATUS_TASK_LOG_SITE_STATUS="Site was %1$s, is now %2$s."
-PLG_TASK_SITE_STATUS_SET_OFFLINE_DESC="Sets site status to online on each run."
+PLG_TASK_SITE_STATUS_SET_OFFLINE_DESC="Sets site status to offline on each run."
 PLG_TASK_SITE_STATUS_SET_OFFLINE_ROUTINE_END_LOG_MESSAGE="SetOffline return code is: %1$d. Processing Time: %2$.2f seconds."
 PLG_TASK_SITE_STATUS_SET_OFFLINE_TITLE="Set Site Offline"
 PLG_TASK_SITE_STATUS_SET_ONLINE_DESC="Sets site status to online on each run."

language/en-GB/com_config.ini

@@ -6,12 +6,12 @@
 COM_CONFIG="Administrator Services"
 COM_CONFIG_CONFIGURATION="Administrator Services Configuration"
 COM_CONFIG_ERROR_CONTROLLER_NOT_FOUND="Controller Not found!"
-COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the default Access Level for newly created items."
+COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
 COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
 COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description"
-COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
 COM_CONFIG_FIELD_SEF_URL_DESC="If this option is disabled, Joomla URLs will not contain any keywords and instead look like <code>index.php?option=com_example&task=item.display&id=1</code> which isn't easy to convey verbally or in writing. Search Engine Friendly (SEF) URLs are more human–readable, e.g. <code>index.php/example/display/something</code>. Despite the setting's name, kept for historical reasons, the URL format no longer has any bearing to how search engines rank your site's pages."
+COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
 COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
 COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
 COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Site Name in Page Titles"

plugins/fields/subform/subform.php

@@ -186,7 +186,7 @@ public function onCustomFieldsPrepareField($context, $item, $field)
 			foreach ($this->getSubfieldsFromField($field) as $subfield)
 			{
 				// Fill value (and rawvalue) if we have data for this subfield in the current row, otherwise set them to empty
-				$subfield->rawvalue = $subfield->value = isset($row[$subfield->name]) ? $row[$subfield->name] : '';
+				$subfield->rawvalue = $subfield->value = $row[$subfield->name] ?? '';
 
 				// Do we want to render the value of this field, and is the value non-empty?
 				if ($subfield->value !== '' && $subfield->render_values == '1')

plugins/system/httpheaders/httpheaders.php

@@ -493,7 +493,7 @@ private function setStaticHeaders(): void
 		{
 			$headerAndClient = explode('#', $headerAndClient);
 			$header = $headerAndClient[0];
-			$client = isset($headerAndClient[1]) ? $headerAndClient[1] : 'both';
+			$client = $headerAndClient[1] ?? 'both';
 
 			if (!$this->app->isClient($client) && $client != 'both')
 			{

plugins/system/privacyconsent/privacyconsent.php

@@ -83,7 +83,7 @@ public function onContentPrepareForm(Form $form, $data)
 		// We only display this if user has not consented before
 		if (is_object($data))
 		{
-			$userId = isset($data->id) ? $data->id : 0;
+			$userId = $data->id ?? 0;
 
 			if ($userId > 0 && $this->isUserConsented($userId))
 			{

plugins/system/webauthn/src/PluginTraits/AjaxHandler.php

@@ -130,7 +130,7 @@ public function onAjaxWebauthn(): void
 
 					if (isset($result['message']))
 					{
-						$type = isset($result['type']) ? $result['type'] : 'info';
+						$type = $result['type'] ?? 'info';
 						$app->enqueueMessage($result['message'], $type);
 
 						$modifiers = " and setting a system message of type $type";

plugins/system/webauthn/src/PluginTraits/UserProfileFields.php

@@ -153,15 +153,15 @@ private function getUserFromData($data): ?User
 
 		if (\is_array($data))
 		{
-			$id = isset($data['id']) ? $data['id'] : null;
+			$id = $data['id'] ?? null;
 		}
 		elseif (\is_object($data) && ($data instanceof Registry))
 		{
 			$id = $data->get('id');
 		}
 		elseif (\is_object($data))
 		{
-			$id = isset($data->id) ? $data->id : null;
+			$id = $data->id ?? null;
 		}
 
 		$user = empty($id) ? Factory::getApplication()->getIdentity() : Factory::getContainer()

plugins/workflow/featuring/featuring.php

@@ -143,7 +143,7 @@ protected function enhanceItemForm(Form $form, $data)
 
 		$options = $form->getField($fieldname)->options;
 
-		$value = isset($data->$fieldname) ? $data->$fieldname : $form->getValue($fieldname, null, 0);
+		$value = $data->$fieldname ?? $form->getValue($fieldname, null, 0);
 
 		$text = '-';
 

plugins/workflow/publishing/publishing.php

@@ -165,7 +165,7 @@ protected function enhanceItemForm(Form $form, $data)
 
 		$options = $form->getField($fieldname)->options;
 
-		$value = isset($data->$fieldname) ? $data->$fieldname : $form->getValue($fieldname, null, 0);
+		$value = $data->$fieldname ?? $form->getValue($fieldname, null, 0);
 
 		$text = '-';