Merge branch '4.0-dev' into media_web_service

administrator/components/com_admin/script.php

@@ -560,7 +560,7 @@ protected function updateManifestCaches()
 	 * Delete files that should not exist
 	 *
 	 * @param bool  $dryRun          If set to true, will not actually delete files, but just report their status for use in CLI
-	 * @param bool  $suppressOutput   Set to true to supress echoing any errors, and just return the $status array
+	 * @param bool  $suppressOutput   Set to true to suppress echoing any errors, and just return the $status array
 	 *
 	 * @return  array
 	 */

administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql

@@ -1,5 +1,5 @@
 --
--- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
+-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation
 -- except of #__finder_xxx tables, those are handled with 4.0.0-2018-07-29.sql at update.
 --
 

administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql

@@ -7,7 +7,7 @@
 --
 
 --
--- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation.
+-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation.
 --
 
 ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

administrator/components/com_contact/config.xml

@@ -396,7 +396,7 @@
 	<fieldset
 		name="Icons"
 		label="COM_CONTACT_ICONS_SETTINGS"
-		description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
+		description="COM_CONTACT_ICONS_SETTINGS_DESC"
 		>
 		<field
 			name="contact_icons"

administrator/components/com_contact/forms/contact.xml

@@ -214,60 +214,6 @@
 			class="advancedSelect"
 			multiple="true"
 		/>
-
-		<field
-			name="contact_icons"
-			type="list"
-			label="COM_CONTACT_FIELD_ICONS_SETTINGS"
-			default="0"
-			validate="options"
-			>
-			<option value="0">COM_CONTACT_FIELD_VALUE_NONE</option>
-			<option value="1">COM_CONTACT_FIELD_VALUE_TEXT</option>
-			<option value="2">COM_CONTACT_FIELD_VALUE_ICONS</option>
-		</field>
-
-		<field
-			name="icon_address"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_email"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_telephone"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_mobile"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_fax"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
-			hide_none="1"
-		/>
-
-		<field
-			name="icon_misc"
-			type="media"
-			label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
-			hide_none="1"
-		/>
 	</fieldset>
 
 	<fieldset name="details" label="COM_CONTACT_CONTACT_DETAILS">

administrator/components/com_fields/tmpl/fields/default_batch_body.php

@@ -17,7 +17,7 @@
 $wa->useScript('com_fields.admin-fields-batch');
 $wa->useScript('joomla.batch-copymove');
 
-$context   = $this->escape($this->state->get('filter.context'));
+$context = $this->escape($this->state->get('filter.context'));
 ?>
 
 <div class="p-3">
@@ -35,7 +35,7 @@
 	</div>
 	<div class="row">
 		<div class="form-group col-md-6">
-			<div class="controls">
+			<div class="control-group">
 				<?php $options = array(
 					HTMLHelper::_('select.option', 'c', Text::_('JLIB_HTML_BATCH_COPY')),
 					HTMLHelper::_('select.option', 'm', Text::_('JLIB_HTML_BATCH_MOVE'))
@@ -51,7 +51,7 @@
 						<?php echo HTMLHelper::_('select.options', $this->get('Groups'), 'value', 'text'); ?>
 					</select>
 				</div>
-				<div id="batch-copy-move" class="control-group radio">
+				<div id="batch-copy-move">
 					<?php echo Text::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
 					<?php echo HTMLHelper::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 				</div>

administrator/components/com_menus/tmpl/items/default_batch_body.php

@@ -48,14 +48,14 @@
 	<div class="row">
 		<?php if ($published >= 0) : ?>
 			<div class="form-group col-md-6">
-				<div class="controls">
+				<div class="control-group">
 					<label id="batch-choose-action-lbl" for="batch-menu-id">
 						<?php echo Text::_('COM_MENUS_BATCH_MENU_LABEL'); ?>
 					</label>
 					<select class="form-select" name="batch[menu_id]" id="batch-menu-id">
 						<option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
 						<?php
-						$opts     = array(
+						$opts = array(
 							'published' => $this->state->get('filter.published'),
 							'checkacl'  => (int) $this->state->get('menutypeid'),
 							'clientid'  => (int) $clientId,
@@ -65,7 +65,7 @@
 					</select>
 				</div>
 
-				<div id="batch-copy-move" class="control-group radio">
+				<div id="batch-copy-move">
 					<?php echo Text::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
 					<?php echo HTMLHelper::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 				</div>

administrator/language/en-GB/com_associations.ini

@@ -46,8 +46,8 @@ COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE="- Select Target Language -"
 COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE_LABEL="Select Target Language"
 COM_ASSOCIATIONS_TABLE_CAPTION="Table of Associations"
 COM_ASSOCIATIONS_TITLE="Associations"
-COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1$s > %2$s)"
-COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1$s > %2$s)"
+COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1$s → %2$s)"
+COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1$s → %2$s)"
 COM_ASSOCIATIONS_TITLE_LIST_SELECT="Multilingual Associations: Select Item Type and Language"
 COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
 COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM="You can't check in this item"

administrator/language/en-GB/com_contact.ini

@@ -37,7 +37,7 @@ COM_CONTACT_FIELD_CONFIG_CONTACT_FORM="Form"
 COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country"
 COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply"
 COM_CONTACT_FIELD_CONFIG_FAX_LABEL="Fax"
-COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for single Contact unless they are changed for a specific menu item or Contact."
+COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for a single Contact unless they are changed for a specific menu item or Contact."
 COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY="Contact"
 COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL="Mobile"
 COM_CONTACT_FIELD_CONFIG_PHONE_LABEL="Phone"
@@ -144,6 +144,7 @@ COM_CONTACT_FORM_TITLE_EDIT="Edit Contact"
 COM_CONTACT_FORM_TITLE_NEW="New Contact"
 COM_CONTACT_HEADING_ASSOCIATION="Association"
 COM_CONTACT_ICONS_SETTINGS="Icons"
+COM_CONTACT_ICONS_SETTINGS_DESC="These settings apply to all single Contact views."
 COM_CONTACT_ID_LABEL="ID"
 COM_CONTACT_MAIL_FIELDSET_LABEL="Mail Options"
 COM_CONTACT_MAIL_MAIL_COPY_DESC="Sent to the submitter of a mail with the contact form if the optional "Send Copy to Submitter" is enabled and selected."

administrator/language/en-GB/com_cpanel.ini

@@ -26,7 +26,7 @@ COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in
 COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
 COM_CPANEL_MSG_STATS_COLLECTION_BODY="<p>Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.</p><p>This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.</p><p>In the interest of full transparency and to help developers <a href=\"https://developer.joomla.org/about/stats.html\">this data is publicly available.</a> An API and graphs will show the Joomla version, PHP versions and database engines in use.</p><p>If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.</p>"
 COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
-COM_CPANEL_MSG_TEXTFILTER3919_BODY="<p>As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System -> Global Configuration -> Text Filters</p>"
+COM_CPANEL_MSG_TEXTFILTER3919_BODY="<p>As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System &rarr; Global Configuration &rarr; Text Filters</p>"
 COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"

administrator/language/en-GB/com_modules.ini

@@ -94,7 +94,7 @@ COM_MODULES_MODULE_TEMPLATE_POSITION="%1$s (%2$s)"
 COM_MODULES_MODULES="Modules"
 COM_MODULES_MODULES_FILTER_SEARCH_DESC="Search in module title and note. Prefix with ID: to search for a module ID."
 COM_MODULES_MODULES_FILTER_SEARCH_LABEL="Search Modules"
-COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="The '%s' module is disabled. Use System > Manage > Extensions to enable it."
+COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="The '%s' module is disabled. Use System → Manage → Extensions to enable it."
 COM_MODULES_MSG_MANAGE_NO_MODULES="There are no modules matching your query"
 COM_MODULES_N_ITEMS_ARCHIVED="%d modules archived."
 COM_MODULES_N_ITEMS_ARCHIVED_1="Module archived."

administrator/language/en-GB/mod_messages.ini

@@ -5,4 +5,4 @@
 
 MOD_MESSAGES="Messages"
 MOD_MESSAGES_PRIVATE_MESSAGES="Private Messages"
-MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position."
+MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position. It is only displayed when there are messages to read."

administrator/language/en-GB/mod_messages.sys.ini

@@ -5,4 +5,4 @@
 
 MOD_MESSAGES="Messages"
 MOD_MESSAGES_LAYOUT_DEFAULT="Default"
-MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position."
+MOD_MESSAGES_XML_DESCRIPTION="This module shows the count of private messages and is intended to be displayed in the 'status' position. It is only displayed when there are messages to read."

administrator/language/en-GB/mod_post_installation_messages.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages"
-MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages."
+MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read."

administrator/language/en-GB/mod_post_installation_messages.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_POST_INSTALLATION_MESSAGES="Post Installation Messages"
-MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages."
+MOD_POST_INSTALLATION_MESSAGES_XML_DESCRIPTION="This module shows a counter and a link to the latest post installation messages. It is only displayed when there are messages to read."

administrator/language/en-GB/plg_system_stats.ini

@@ -20,7 +20,7 @@ PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND="Always send"
 PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND="Never send"
 PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND="On demand"
 PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA="Enable Joomla Statistics?"
-PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System - Joomla! Statistics."
+PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins → System - Joomla! Statistics."
 PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT="Select here to see the information that will be sent."
 PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique ID"
 PLG_SYSTEM_STATS_SETTING="Setting"

administrator/language/en-GB/plg_system_updatenotification.ini

@@ -16,4 +16,4 @@ PLG_SYSTEM_UPDATENOTIFICATION_MAIL_MAIL_TITLE="Joomla: Update Notification"
 PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration"
 PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)"
 PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="<p>In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails.</p>"
-PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates."
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."

administrator/language/en-GB/plg_system_updatenotification.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System > Mail Templates."
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System → Mail Templates."

administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php

@@ -234,7 +234,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
 					'link'    => Route::_('index.php?option=com_cache'),
 					'name'    => 'MOD_QUICKICON_CACHE',
 					'access'  => array('core.admin', 'com_cache'),
-					'group'   => 'MOD_QUICKICON_SYTEM'
+					'group'   => 'MOD_QUICKICON_SYSTEM'
 				];
 
 				if ($params->get('show_cache') == 2)

installation/language/en-GB/joomla.ini

@@ -81,7 +81,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed."
 INSTL_DATABASE_HOST_DESC="Enter the host name, usually \"localhost\" or a name provided by your host."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named \"%1$s\" and upload it to the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="To confirm that you are the owner of this website please delete the file named \"%1$s\" that has been created in the \"%2$s\" folder of your Joomla site. Then select \"%3$s\" to continue."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href=\"%s\" target=\"_blank\">Please read the documentation</a> for more information."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Please read the documentation</a> for more information."
 INSTL_DATABASE_HOST_LABEL="Host Name"
 INSTL_DATABASE_NAME_DESC="Enter the database name."
 INSTL_DATABASE_NAME_LABEL="Database Name"
@@ -94,7 +94,7 @@ INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally
 INSTL_DATABASE_RESPONSE_ERROR="The installation process failed."
 INSTL_DATABASE_TYPE_DESC="Select the database type."
 INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host."
-INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this <a href=\"https://docs.joomla.org/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\">wiki</a> for more information."
+INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this <a href=\"https://docs.joomla.org/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">wiki</a> for more information."
 
 INSTL_CONNECT_DB="Setup Database Connection"
 INSTL_INSTALL_JOOMLA="Install Joomla"

language/en-GB/mod_login.ini

@@ -25,4 +25,4 @@ MOD_LOGIN_VALUE_ICONS="Icons"
 MOD_LOGIN_VALUE_NAME="Name"
 MOD_LOGIN_VALUE_TEXT="Text"
 MOD_LOGIN_VALUE_USERNAME="Username"
-MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users."
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users → Manage → Options), another link will be shown to enable self-registration for users."

language/en-GB/mod_login.sys.ini

@@ -5,5 +5,5 @@
 
 MOD_LOGIN="Login"
 MOD_LOGIN_LAYOUT_DEFAULT="Default"
-MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users."
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users → Manage → Options), another link will be shown to enable self-registration for users."
 

libraries/src/Application/DaemonApplication.php

@@ -466,15 +466,15 @@ protected function changeIdentity()
 		// Change the user id for the process necessary.
 		if ($uid && (posix_getuid($file) != $uid) && (!@ posix_setuid($uid)))
 		{
-			Log::add('Unable to change user ownership of the proccess.', Log::ERROR);
+			Log::add('Unable to change user ownership of the process.', Log::ERROR);
 
 			return false;
 		}
 
 		// Change the group id for the process necessary.
 		if ($gid && (posix_getgid($file) != $gid) && (!@ posix_setgid($gid)))
 		{
-			Log::add('Unable to change group ownership of the proccess.', Log::ERROR);
+			Log::add('Unable to change group ownership of the process.', Log::ERROR);
 
 			return false;
 		}
@@ -806,15 +806,15 @@ protected function writeProcessIdFile()
 		// Write the process id file out to disk.
 		if (!file_put_contents($file, $this->processId))
 		{
-			Log::add('Unable to write proccess id file: ' . $file, Log::ERROR);
+			Log::add('Unable to write process id file: ' . $file, Log::ERROR);
 
 			return false;
 		}
 
-		// Make sure the permissions for the proccess id file are accurate.
+		// Make sure the permissions for the process id file are accurate.
 		if (!chmod($file, 0644))
 		{
-			Log::add('Unable to adjust permissions for the proccess id file: ' . $file, Log::ERROR);
+			Log::add('Unable to adjust permissions for the process id file: ' . $file, Log::ERROR);
 
 			return false;
 		}

libraries/src/Console/SetConfigurationCommand.php

@@ -341,7 +341,7 @@ public function checkDb($options): bool
 
 		if (!$model->validateDbConnection($options))
 		{
-			$this->ioStyle->error(Text::_('Failed to validate the db connection encription properties'));
+			$this->ioStyle->error(Text::_('Failed to validate the db connection encryption properties'));
 
 			return false;
 		}