Merge tag '3.9.14' into 4.0-dev

Joomla! 3.9.14
sanderpotjer · Mar 4, 2020 · 032ea5d · 032ea5d
2 parents 78bdb9b + e5dc4be
commit 032ea5d
Show file tree

Hide file tree

Showing 86 changed files with 216 additions and 86 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -32,7 +32,7 @@ People on every project come and go, and Joomla is no different. When you leave
 Check your e-mails regularly and answer them promptly—even if it's "I'll get back to you."
 ## Be Honest
 
-Sometimes the hardest thing to say is "no" or admit you've forgotten do something. Be honest with each other and yourself with regards to what you say and what you can realistically commit to.
+Sometimes the hardest thing to say is "no" or admit you've forgotten to do something. Be honest with each other and yourself with regards to what you say and what you can realistically commit to.
 ## Follow the Rules
 
 Volunteers are expected to uphold Joomla's licensing and trademark requirements including, but not limited to, compliance on their own or affiliate websites and extensions. Make sure you have sought the appropriate approvals for domain name, name and logo usage prior to volunteering and that any extensions you distribute comply with the Joomla license.

diff --git a/administrator/components/com_actionlogs/forms/filter_actionlogs.xml b/administrator/components/com_actionlogs/forms/filter_actionlogs.xml
@@ -41,6 +41,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.id DESC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.message ASC">COM_ACTIONLOGS_ACTION_ASC</option>

diff --git a/administrator/components/com_associations/forms/filter_associations.xml b/administrator/components/com_associations/forms/filter_associations.xml
@@ -89,6 +89,7 @@
 			label="JGLOBAL_SORT_BY"
 			default="id ASC"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="state ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_banners/forms/filter_banners.xml b/administrator/components/com_banners/forms/filter_banners.xml
@@ -71,6 +71,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_banners/forms/filter_clients.xml b/administrator/components/com_banners/forms/filter_clients.xml
@@ -42,6 +42,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.state ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_banners/forms/filter_tracks.xml b/administrator/components/com_banners/forms/filter_tracks.xml
@@ -63,7 +63,6 @@
 			format="%Y-%m-%d"
 			size="10"
 			filter="user_utc"
-			onchange="this.form.submit();"
 		/>
 
 		<field
@@ -74,7 +73,6 @@
 			format="%Y-%m-%d"
 			size="10"
 			filter="user_utc"
-			onchange="this.form.submit();"
 		/>
     </fields>
 	<fields name="list">
@@ -84,6 +82,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="b.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="b.name ASC">JGLOBAL_NAME_ASC</option>

diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php
@@ -407,9 +407,9 @@ protected function getCategoryName()
 	}
 
 	/**
-	 * Get the category name
+	 * Get the client name
 	 *
-	 * @return  string  The category name.
+	 * @return  string  The client name.
 	 *
 	 * @since   1.6
 	 */

diff --git a/administrator/components/com_cache/forms/filter_cache.xml b/administrator/components/com_cache/forms/filter_cache.xml
@@ -18,6 +18,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="group ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="group ASC">COM_CACHE_HEADING_GROUP_ASC</option>

diff --git a/administrator/components/com_categories/forms/filter_categories.xml b/administrator/components/com_categories/forms/filter_categories.xml
@@ -74,6 +74,7 @@
 			default="a.lft ASC"
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_checkin/forms/filter_checkin.xml b/administrator/components/com_checkin/forms/filter_checkin.xml
@@ -18,6 +18,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="table ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="table ASC">COM_CHECKIN_DATABASE_TABLE_ASC</option>

diff --git a/administrator/components/com_contact/forms/filter_contacts.xml b/administrator/components/com_contact/forms/filter_contacts.xml
@@ -96,6 +96,7 @@
 			label="JGLOBAL_SORT_BY"
 			default="a.name ASC"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
@@ -119,6 +119,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.id DESC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
@@ -106,6 +106,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.title ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="fp.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_fields/forms/filter_fields.xml b/administrator/components/com_fields/forms/filter_fields.xml
@@ -14,6 +14,7 @@
 			type="text"
 			inputmode="search"
 			label=""
+			description="COM_FIELDS_FIELDS_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 			class="js-stools-search-string"
 		/>
@@ -74,6 +75,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.ordering ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_fields/forms/filter_groups.xml b/administrator/components/com_fields/forms/filter_groups.xml
@@ -13,6 +13,7 @@
 			name="search"
 			type="text"
 			inputmode="search"
+			description="COM_FIELDS_GROUPS_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 			class="js-stools-search-string"
 		/>
@@ -52,6 +53,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.ordering ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_finder/forms/filter_filters.xml b/administrator/components/com_finder/forms/filter_filters.xml
@@ -28,6 +28,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.title ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.state ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_finder/forms/filter_index.xml b/administrator/components/com_finder/forms/filter_index.xml
@@ -56,6 +56,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="l.title ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="l.published ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_finder/forms/filter_maps.xml b/administrator/components/com_finder/forms/filter_maps.xml
@@ -49,6 +49,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="branch_title ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.state ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_finder/forms/filter_searches.xml b/administrator/components/com_finder/forms/filter_searches.xml
@@ -17,6 +17,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.hits ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.searchterm ASC">COM_FINDER_HEADING_SEARCH_TERM_ASC</option>

diff --git a/administrator/components/com_installer/forms/filter_discover.xml b/administrator/components/com_installer/forms/filter_discover.xml
@@ -45,6 +45,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="name ASC">JGLOBAL_NAME_ASC</option>

diff --git a/administrator/components/com_installer/forms/filter_languages.xml b/administrator/components/com_installer/forms/filter_languages.xml
@@ -17,6 +17,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="name ASC">JGRID_HEADING_LANGUAGE_ASC</option>

diff --git a/administrator/components/com_installer/forms/filter_manage.xml b/administrator/components/com_installer/forms/filter_manage.xml
@@ -65,6 +65,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="status ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_installer/forms/filter_update.xml b/administrator/components/com_installer/forms/filter_update.xml
@@ -41,6 +41,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="u.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="u.name ASC">JGLOBAL_NAME_ASC</option>

diff --git a/administrator/components/com_installer/forms/filter_updatesites.xml b/administrator/components/com_installer/forms/filter_updatesites.xml
@@ -62,6 +62,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="enabled ASC">JSTATUS_ASC</option>

diff --git a/administrator/components/com_installer/src/Model/LanguagesModel.php b/administrator/components/com_installer/src/Model/LanguagesModel.php
@@ -127,6 +127,14 @@ protected function getLanguages()
 	{
 		$updateSite = $this->getUpdateSite();
 
+		// Check whether the updateserver is found
+		if (empty($updateSite))
+		{
+			Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER'), 'warning');
+
+			return;
+		}
+
 		try
 		{
 			$response = HttpFactory::getHttp()->get($updateSite);
@@ -138,7 +146,7 @@ protected function getLanguages()
 
 		if ($response === null || $response->code !== 200)
 		{
-			Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER'), 'warning');
+			Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_CONNECT_TO_UPDATESERVER', $updateSite), 'error');
 
 			return;
 		}

diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
@@ -109,8 +109,8 @@ public function display($tpl = null)
 		$this->loadHelper('select');
 
 		// Assign view variables.
-		$ftp           = $model->getFTPOptions();
-		$defaultMethod = $ftp['enabled'] ? 'hybrid' : 'direct';
+		$this->ftp     = $model->getFTPOptions();
+		$defaultMethod = $this->ftp['enabled'] ? 'hybrid' : 'direct';
 
 		$this->updateInfo         = $model->getUpdateInformation();
 		$this->methodSelect       = JoomlaupdateHelperSelect::getMethods($defaultMethod);

diff --git a/administrator/components/com_languages/forms/filter_installed.xml b/administrator/components/com_languages/forms/filter_installed.xml
@@ -28,6 +28,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="name ASC">COM_LANGUAGES_HEADING_LANGUAGE_ASC</option>

diff --git a/administrator/components/com_languages/forms/filter_languages.xml b/administrator/components/com_languages/forms/filter_languages.xml
@@ -34,6 +34,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.ordering ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_languages/src/Controller/DisplayController.php b/administrator/components/com_languages/src/Controller/DisplayController.php
@@ -23,7 +23,7 @@
 class DisplayController extends BaseController
 {
 	/**
-	 * @var		string	The default view.
+	 * @var	    string	The default view.
 	 * @since   1.6
 	 */
 	protected $default_view = 'installed';

diff --git a/administrator/components/com_languages/src/Controller/OverridesController.php b/administrator/components/com_languages/src/Controller/OverridesController.php
@@ -35,14 +35,14 @@ class OverridesController extends AdminController
 	 *
 	 * @return  void
 	 *
-	 * @since		2.5
+	 * @since   2.5
 	 */
 	public function delete()
 	{
 		// Check for request forgeries.
 		$this->checkToken();
 
-		// Get items to dlete from the request.
+		// Get items to delete from the request.
 		$cid = $this->input->get('cid', array(), 'array');
 
 		if (!is_array($cid) || count($cid) < 1)

diff --git a/administrator/components/com_languages/src/Controller/StringsController.php b/administrator/components/com_languages/src/Controller/StringsController.php
@@ -26,7 +26,7 @@ class StringsController extends AdminController
 	 *
 	 * @return  void
 	 *
-	 * @since		2.5
+	 * @since   2.5
 	 */
 	public function refresh()
 	{
@@ -38,7 +38,7 @@ public function refresh()
 	 *
 	 * @return  void
 	 *
-	 * @since		2.5
+	 * @since   2.5
 	 */
 	public function search()
 	{

diff --git a/administrator/components/com_menus/forms/filter_items.xml b/administrator/components/com_menus/forms/filter_items.xml
@@ -85,6 +85,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.lft ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_menus/forms/filter_itemsadmin.xml b/administrator/components/com_menus/forms/filter_itemsadmin.xml
@@ -63,6 +63,7 @@
 			statuses="*,0,1,2,-2"
 			onchange="this.form.submit();"
 			default="a.lft ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_menus/forms/filter_menus.xml b/administrator/components/com_menus/forms/filter_menus.xml
@@ -27,6 +27,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.title ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>

diff --git a/administrator/components/com_messages/forms/filter_messages.xml b/administrator/components/com_messages/forms/filter_messages.xml
@@ -26,6 +26,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.date_time DESC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.subject ASC">COM_MESSAGES_HEADING_SUBJECT_ASC</option>

diff --git a/administrator/components/com_modules/forms/filter_modules.xml b/administrator/components/com_modules/forms/filter_modules.xml
@@ -81,6 +81,7 @@
 			statuses="*,0,1,-2"
 			onchange="this.form.submit();"
 			default="a.position ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_modules/forms/filter_modulesadmin.xml b/administrator/components/com_modules/forms/filter_modulesadmin.xml
@@ -74,6 +74,7 @@
 			statuses="*,0,1,-2"
 			onchange="this.form.submit();"
 			default="a.position ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_newsfeeds/forms/filter_newsfeeds.xml b/administrator/components/com_newsfeeds/forms/filter_newsfeeds.xml
@@ -84,6 +84,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.name ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_plugins/forms/filter_plugins.xml b/administrator/components/com_plugins/forms/filter_plugins.xml
@@ -54,6 +54,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="folder ASC"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="ordering ASC">JGRID_HEADING_ORDERING_ASC</option>

diff --git a/administrator/components/com_privacy/forms/filter_consents.xml b/administrator/components/com_privacy/forms/filter_consents.xml
@@ -47,6 +47,7 @@
 			label="JGLOBAL_SORT_BY"
 			onchange="this.form.submit();"
 			default="a.id DESC"
+			validate="options"
 			>
 			<option value="a.state ASC">COM_PRIVACY_HEADING_STATUS_ASC</option>
 			<option value="a.state DESC">COM_PRIVACY_HEADING_STATUS_DESC</option>