From 28fe9eb21b051ef9c2fb73ecb34eac1d00ab2e49 Mon Sep 17 00:00:00 2001
From: Quy <quy@fluxbb.org>
Date: Sat, 2 May 2020 23:29:37 -0700
Subject: [PATCH 1/9] [4.0] Fix login alert in footer (#28911)

* Fix login alert in footer

* Move alert to the top

* Remove .notify-alerts scss
---
 administrator/templates/atum/error_full.php   |  5 +-
 administrator/templates/atum/login.php        |  5 +-
 .../templates/atum/scss/template-rtl.scss     | 14 ----
 templates/cassiopeia/scss/blocks/_alerts.scss | 69 +------------------
 4 files changed, 3 insertions(+), 90 deletions(-)

diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
index 15c0bba9b5670..9ce73dc6b4993 100644
--- a/administrator/templates/atum/error_full.php
+++ b/administrator/templates/atum/error_full.php
@@ -128,6 +128,7 @@
 		<?php endif; ?>
 		<section id="content" class="content">
 			<?php // Begin Content ?>
+			<jdoc:include type="message" />
 			<jdoc:include type="modules" name="top" style="xhtml" />
 			<div class="row">
 				<div class="col-md-12">
@@ -169,10 +170,6 @@
 			</div>
 			<?php // End Content ?>
 		</section>
-
-		<div class="notify-alerts">
-			<jdoc:include type="message"/>
-		</div>
 	</div>
 </div>
 <jdoc:include type="modules" name="debug" style="none" />
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index 20d691eaa7733..ea3d241c51382 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -108,6 +108,7 @@
 
 	<div class="container-fluid container-main order-1">
 		<section id="content" class="content h-100">
+			<jdoc:include type="message" />
 			<main class="d-flex justify-content-center align-items-center h-100">
 				<div class="login">
 					<div class="main-brand logo text-center">
@@ -118,10 +119,6 @@
 				</div>
 			</main>
 		</section>
-
-		<div class="notify-alerts">
-			<jdoc:include type="message" />
-		</div>
 	</div>
 
 	<?php // Sidebar ?>
diff --git a/administrator/templates/atum/scss/template-rtl.scss b/administrator/templates/atum/scss/template-rtl.scss
index 3ecbaad23510c..43918cf94c409 100644
--- a/administrator/templates/atum/scss/template-rtl.scss
+++ b/administrator/templates/atum/scss/template-rtl.scss
@@ -9,11 +9,6 @@ ul {
 
 .close {
   float: left;
-
-  .notify-alerts & {
-    right: auto;
-    left: -.5rem;
-  }
 }
 
 .dropdown-menu-right {
@@ -33,15 +28,6 @@ ul {
   float: right;
 }
 
-// Alerts
-.notify-alerts {
-  margin-left: 0;
-
-  .closed & {
-    margin-right: 0;
-  }
-}
-
 // Header
 .header {
   .page-title [class^='icon-'] {
diff --git a/templates/cassiopeia/scss/blocks/_alerts.scss b/templates/cassiopeia/scss/blocks/_alerts.scss
index 0e79816cc1696..07fc2e7dba5fc 100644
--- a/templates/cassiopeia/scss/blocks/_alerts.scss
+++ b/templates/cassiopeia/scss/blocks/_alerts.scss
@@ -20,71 +20,4 @@
     transform: translateY(0);
   }
 
-}
-
-.notify-alerts {
-  position: fixed;
-  top: 15px;
-  left: 50%;
-  z-index: 1031;
-  margin-left: 125px;
-  transition: all .5s ease;
-  transform: translateX(-50%);
-
-  .alert {
-    width: 100%;
-    min-width: 280px;
-    max-width: 400px;
-    margin-bottom: .5rem;
-    box-shadow: #8d8d8d;
-    opacity: 0;
-    animation: fadeIn ease-in 1;
-    animation-duration: .35s;
-    animation-delay: 0s;
-    animation-fill-mode: forwards;
-
-    &:first-of-type {
-      animation-delay: .3s;
-    }
-
-  }
-
-  &.fullWidth {
-    left: 265px;
-
-    .alert {
-      width: auto;
-      min-width: none;
-      max-width: none;
-      margin-left: 0;
-    }
-
-  }
-
-  .close {
-    line-height: 1rem;
-    color: $white-offset;
-    opacity: 1;
-  }
-
-}
-
-.closed {
-
-  .notify-alerts {
-    margin-left: 0;
-  }
-
-  + .notify-alerts.fullWidth {
-    left: 70px;
-  }
-
-}
-
-.wrapper0 {
-
-  .notify-alerts {
-    margin-left: 0;
-  }
-
-}
+}
\ No newline at end of file

From 56f8ea6ccaff725690024589bcefdf8a4eb55fc1 Mon Sep 17 00:00:00 2001
From: Quy <quy@fluxbb.org>
Date: Sun, 3 May 2020 02:02:17 -0700
Subject: [PATCH 2/9] Improve add module tooltip (#28912)

---
 administrator/language/en-GB/mod_quickicon.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/mod_quickicon.ini b/administrator/language/en-GB/mod_quickicon.ini
index 0f68a26f4b9e9..708a4fe02279a 100644
--- a/administrator/language/en-GB/mod_quickicon.ini
+++ b/administrator/language/en-GB/mod_quickicon.ini
@@ -24,7 +24,7 @@ MOD_QUICKICON_MEDIA_MANAGER="Media"
 MOD_QUICKICON_MENUITEMS_MANAGER="Menu Items"
 MOD_QUICKICON_MENUITEMS_MANAGER_ADD="Add Menu Item"
 MOD_QUICKICON_MODULE_MANAGER="Modules"
-MOD_QUICKICON_MODULE_MANAGER_ADD="Add Module"
+MOD_QUICKICON_MODULE_MANAGER_ADD="Add Site Module"
 MOD_QUICKICON_NAV_LABEL="Quick Links"
 MOD_QUICKICON_PLUGIN_MANAGER="Plugins"
 MOD_QUICKICON_SHOW_ARTICLES_LABEL="Articles Icon"

From f02c9cc38babcd318604ce9f7c1404d2ccf3af14 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Mon, 4 May 2020 11:18:47 +0100
Subject: [PATCH 3/9] [4.0] th on safari (#28921)

* [4.0] th on safari

PR for #28904

This is a test PR for the TH alignment issue with safari. It is a bug in bootstrap that they have fixed and merged but not released yet. See https://github.com/twbs/bootstrap/pull/30323

This PR adds a _temporary_ reboot.css override with the code direct from bootstrap. I can't see any other way to fix this beta blocker.

I do not have access to Safari to test this.

@nikosdion please can you test this

* Update _reboot.scss
---
 administrator/templates/atum/scss/template.scss            | 1 +
 .../templates/atum/scss/vendor/bootstrap/_reboot.scss      | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 administrator/templates/atum/scss/vendor/bootstrap/_reboot.scss

diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index f41719dde97bb..6ded397ab0417 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -30,6 +30,7 @@
 @import "vendor/bootstrap/modal";
 @import "vendor/bootstrap/nav";
 @import "vendor/bootstrap/pagination";
+@import "vendor/bootstrap/reboot";
 @import "vendor/bootstrap/table";
 
 // Blocks
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_reboot.scss b/administrator/templates/atum/scss/vendor/bootstrap/_reboot.scss
new file mode 100644
index 0000000000000..f0d3e7ef6cd1e
--- /dev/null
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_reboot.scss
@@ -0,0 +1,7 @@
+// Matches default `<td>` alignment by inheriting `text-align`.
+// 1. Fix alignment for Safari
+
+th {
+  text-align: inherit;
+  text-align: -webkit-match-parent; // 1
+}

From 40964564352f05fb9fdec16087990c7b23edc5c5 Mon Sep 17 00:00:00 2001
From: SharkyKZ <sharkykz@gmail.com>
Date: Wed, 6 May 2020 08:36:17 +0300
Subject: [PATCH 4/9] Remove deprecated method (#28947)

---
 .../com_languages/src/Helper/LanguagesHelper.php  | 15 ---------------
 .../com_languages/src/Model/StringsModel.php      |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/administrator/components/com_languages/src/Helper/LanguagesHelper.php b/administrator/components/com_languages/src/Helper/LanguagesHelper.php
index bbf760fd63a43..1f29ec2de21d8 100644
--- a/administrator/components/com_languages/src/Helper/LanguagesHelper.php
+++ b/administrator/components/com_languages/src/Helper/LanguagesHelper.php
@@ -20,21 +20,6 @@
  */
 class LanguagesHelper
 {
-	/**
-	 * Method for parsing ini files.
-	 *
-	 * @param   string  $fileName  Path and name of the ini file to parse.
-	 *
-	 * @return  array   Array of strings found in the file, the array indices will be the keys. On failure an empty array will be returned.
-	 *
-	 * @since   2.5
-	 * @deprecated   3.9.0 Use \Joomla\CMS\Language\LanguageHelper::parseIniFile() instead.
-	 */
-	public static function parseFile($fileName)
-	{
-		return LanguageHelper::parseIniFile($fileName);
-	}
-
 	/**
 	 * Filter method for language keys.
 	 * This method will be called by \JForm while filtering the form data.
diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php
index c99d7e6086599..89ccc176f1b83 100644
--- a/administrator/components/com_languages/src/Model/StringsModel.php
+++ b/administrator/components/com_languages/src/Model/StringsModel.php
@@ -15,8 +15,8 @@
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Component\Languages\Administrator\Helper\LanguagesHelper;
 use Joomla\Database\ParameterType;
 
 /**
@@ -91,7 +91,7 @@ public function refresh()
 		// Parse all found ini files and add the strings to the database cache.
 		foreach ($files as $file)
 		{
-			$strings = LanguagesHelper::parseFile($file);
+			$strings = LanguageHelper::parseIniFile($file);
 
 			if ($strings)
 			{

From 20c81c225c23c436b2564c4b5bab5da46c1aa73a Mon Sep 17 00:00:00 2001
From: Quy <quy@fluxbb.org>
Date: Wed, 6 May 2020 00:51:32 -0700
Subject: [PATCH 5/9] Replace inline style 5% with w-5 (#28905)

---
 .../com_associations/tmpl/associations/default.php        | 4 ++--
 .../com_associations/tmpl/associations/modal.php          | 4 ++--
 .../components/com_banners/tmpl/banners/default.php       | 2 +-
 .../components/com_categories/tmpl/categories/default.php | 2 +-
 .../components/com_contact/tmpl/contacts/default.php      | 2 +-
 .../components/com_content/tmpl/articles/default.php      | 2 +-
 .../components/com_content/tmpl/articles/modal.php        | 2 +-
 .../components/com_fields/tmpl/fields/default.php         | 2 +-
 .../components/com_fields/tmpl/groups/default.php         | 2 +-
 .../components/com_finder/tmpl/filters/default.php        | 2 +-
 .../components/com_installer/tmpl/languages/default.php   | 2 +-
 .../components/com_installer/tmpl/manage/default.php      | 2 +-
 .../components/com_installer/tmpl/updatesites/default.php | 2 +-
 .../components/com_languages/tmpl/installed/default.php   | 6 +++---
 .../components/com_languages/tmpl/languages/default.php   | 2 +-
 administrator/components/com_menus/tmpl/items/default.php | 2 +-
 administrator/components/com_menus/tmpl/items/modal.php   | 2 +-
 administrator/components/com_menus/tmpl/menus/default.php | 4 ++--
 .../components/com_modules/tmpl/modules/default.php       | 2 +-
 .../components/com_newsfeeds/tmpl/newsfeeds/default.php   | 4 ++--
 .../components/com_plugins/tmpl/plugins/default.php       | 2 +-
 .../components/com_privacy/tmpl/consents/default.php      | 2 +-
 .../components/com_privacy/tmpl/requests/default.php      | 4 ++--
 administrator/components/com_tags/tmpl/tags/default.php   | 2 +-
 .../components/com_templates/tmpl/styles/default.php      | 4 ++--
 .../com_templates/tmpl/template/default_updated_files.php | 2 +-
 administrator/components/com_users/tmpl/users/default.php | 8 ++++----
 administrator/templates/atum/scss/blocks/_utilities.scss  | 4 ++++
 28 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index 74d2e80136252..4dbd03586dc22 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.php
@@ -65,7 +65,7 @@
 								<th scope="col" style="width:15%">
 									<?php echo Text::_('JGRID_HEADING_LANGUAGE'); ?>
 								</th>
-								<th scope="col" style="width:5%">
+								<th scope="col" class="w-5">
 									<?php echo Text::_('COM_ASSOCIATIONS_HEADING_ASSOCIATION'); ?>
 								</th>
 								<th scope="col" style="width:15%">
@@ -77,7 +77,7 @@
 									</th>
 								<?php endif; ?>
 								<?php if (!empty($this->typeFields['access'])) : ?>
-									<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+									<th scope="col" class="w-5 d-none d-md-table-cell">
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index fbe3ed590025d..2e3de5daf2ebe 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -68,7 +68,7 @@
 					<th scope="col" style="width:15%">
 						<?php echo Text::_('JGRID_HEADING_LANGUAGE'); ?>
 					</th>
-					<th scope="col" style="width:5%">
+					<th scope="col" class="w-5">
 						<?php echo HTMLHelper::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
 					</th>
 					<?php if (!empty($this->typeFields['menutype'])) : ?>
@@ -77,7 +77,7 @@
 						</th>
 					<?php endif; ?>
 					<?php if (!empty($this->typeSupports['acl'])) : ?>
-						<th scope="col" style="width:5%" class="d-none d-sm-table-cell">
+						<th scope="col" class="w-5 d-none d-sm-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 						</th>
 					<?php endif; ?>
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
index df3e236c463a3..eb08760a1a554 100644
--- a/administrator/components/com_banners/tmpl/banners/default.php
+++ b/administrator/components/com_banners/tmpl/banners/default.php
@@ -82,7 +82,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
index 3eb6d0245d5cb..a3a2d45b6dbfc 100644
--- a/administrator/components/com_categories/tmpl/categories/default.php
+++ b/administrator/components/com_categories/tmpl/categories/default.php
@@ -118,7 +118,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
index 9a03ba459d5cc..c9fdf05686084 100644
--- a/administrator/components/com_contact/tmpl/contacts/default.php
+++ b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -81,7 +81,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index 0431cfb79263c..8f2260099a6c6 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -125,7 +125,7 @@
 									<?php echo HTMLHelper::_('searchtools.sort',  'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
 								</th>
 								<?php if ($assoc) : ?>
-									<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+									<th scope="col" class="w-5 d-none d-md-table-cell">
 										<?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTENT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index f9645627f6afe..f04caabeda9ab 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -72,7 +72,7 @@
 						<th scope="col" style="width:15%">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-5 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index 7a97051399e6a..9112ecaeda3bf 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -90,7 +90,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index 7863d4c9edc7d..e89aa4af4c03c 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -78,7 +78,7 @@
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
 								</th>
 								<?php if (Multilanguage::isEnabled()) : ?>
-									<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+									<th scope="col" class="w-5 d-none d-md-table-cell">
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index d7f0cf626ccd0..00dbb67d8fa51 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -55,7 +55,7 @@
 							<th scope="col" class="w-10 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+							<th scope="col" class="w-5 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:1%" class="d-none d-md-table-cell">
diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php
index 7bb35f097cfa2..c45b461d790b9 100644
--- a/administrator/components/com_installer/tmpl/languages/default.php
+++ b/administrator/components/com_installer/tmpl/languages/default.php
@@ -38,7 +38,7 @@
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:5%"></td>
+								<td class="w-5"></td>
 								<th scope="col">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'name', $listDirn, $listOrder); ?>
 								</th>
diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php
index 64303923b055d..e331a8203674e 100644
--- a/administrator/components/com_installer/tmpl/manage/default.php
+++ b/administrator/components/com_installer/tmpl/manage/default.php
@@ -68,7 +68,7 @@
 								<th scope="col" class="w-10 d-none d-md-table-cell">
 									<?php echo Text::_('JAUTHOR'); ?>
 								</th>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php
index e94d7c38b25e3..d8dc554c5537a 100644
--- a/administrator/components/com_installer/tmpl/updatesites/default.php
+++ b/administrator/components/com_installer/tmpl/updatesites/default.php
@@ -63,7 +63,7 @@
 								<th scope="col" class="w-10 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'update_site_id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php
index d8c2ce9517eb5..2e8afa3884171 100644
--- a/administrator/components/com_languages/tmpl/installed/default.php
+++ b/administrator/components/com_languages/tmpl/installed/default.php
@@ -50,10 +50,10 @@
 							<th scope="col" class="text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_TAG', 'language', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:5%" class="text-center">
+							<th scope="col" class="w-5 text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_HEADING_DEFAULT', 'published', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:5%" class="d-none d-md-table-cell text-center">
+							<th scope="col" class="w-5 d-none d-md-table-cell text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_HEADING_VERSION', 'version', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" class="w-10 d-none d-md-table-cell text-center">
@@ -65,7 +65,7 @@
 							<th scope="col" class="w-10 d-none d-md-table-cell text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_HEADING_AUTHOR_EMAIL', 'authorEmail', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:5%" class="d-none d-md-table-cell text-center">
+							<th scope="col" class="w-5 d-none d-md-table-cell text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
 							</th>
 						</tr>
diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php
index 49e37167ca47b..613ce722ab864 100644
--- a/administrator/components/com_languages/tmpl/languages/default.php
+++ b/administrator/components/com_languages/tmpl/languages/default.php
@@ -77,7 +77,7 @@
 								<th scope="col" class="w-10 d-none d-md-table-cell text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_HEADING_HOMEPAGE', 'l.home', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell text-center">
+								<th scope="col" class="w-5 d-none d-md-table-cell text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.lang_id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
index 427c494ddb249..1777f6de590e8 100644
--- a/administrator/components/com_menus/tmpl/items/default.php
+++ b/administrator/components/com_menus/tmpl/items/default.php
@@ -89,7 +89,7 @@
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 								</th>
 							<?php endif; ?>
-							<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+							<th scope="col" class="w-5 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 							</th>
 						</tr>
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 07c4062f4abd6..59afccaff7928 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -67,7 +67,7 @@
 						<th scope="col" class="d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_MENUS_HEADING_MENU', 'menutype_title', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:5%" class="text-center d-none d-md-table-cell">
+						<th scope="col" class="w-5 text-center d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_MENUS_HEADING_HOME', 'a.home', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="w-10 d-none d-md-table-cell">
diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php
index 5675119127812..7c45f2aade97d 100644
--- a/administrator/components/com_menus/tmpl/menus/default.php
+++ b/administrator/components/com_menus/tmpl/menus/default.php
@@ -60,7 +60,7 @@
 								<th scope="col">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%" class="text-center">
+								<th scope="col" class="w-5 text-center">
 									<?php echo Text::_('COM_MENUS_MENUS'); ?>
 								</th>
 								<th scope="col" class="w-10 text-center  d-none d-md-table-cell">
@@ -79,7 +79,7 @@
 									<span class="fas fa-cube" aria-hidden="true"></span>
 									<span class="d-none d-md-inline"><?php echo Text::_('COM_MENUS_HEADING_LINKED_MODULES'); ?></span>
 								</th>
-								<th scope="col" style="width:5%" class="d-none d-lg-table-cell text-center">
+								<th scope="col" class="w-5 d-none d-lg-table-cell text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index d79eae2a03cc3..f67764ae720cd 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -77,7 +77,7 @@
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 						</th>
 						<?php endif; ?>
-						<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-5 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index 7841bafb4ff6e..dca9055afaeac 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -55,7 +55,7 @@
 								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 								</th>
-								<th scope="col" style="width:5%; min-width:85px" class="text-center">
+								<th scope="col" style="min-width:85px" class="w-5 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="title">
@@ -80,7 +80,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index 3269e04dfe9d3..e60f250e36cab 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.php
@@ -65,7 +65,7 @@
 						<th scope="col" class="w-10 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-5 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
index 89cb74f486a07..c7946744ce875 100644
--- a/administrator/components/com_privacy/tmpl/consents/default.php
+++ b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -50,7 +50,7 @@
 						<td style="width:1%" class="text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
-						<th scope="col" style="width:5%" class="text-center">
+						<th scope="col" class="w-5 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" width="10%">
diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php
index e89fc47ca5d78..ed1e0f2297ee6 100644
--- a/administrator/components/com_privacy/tmpl/requests/default.php
+++ b/administrator/components/com_privacy/tmpl/requests/default.php
@@ -45,10 +45,10 @@
 				</caption>
 				<thead>
 					<tr>
-						<th scope="col" style="width:5%" class="text-center">
+						<th scope="col" class="w-5 text-center">
 							<?php echo Text::_('COM_PRIVACY_HEADING_ACTIONS'); ?>
 						</th>
-						<th scope="col" style="width:5%" class="text-center">
+						<th scope="col" class="w-5 text-center">
 							<?php echo Text::_('JSTATUS'); ?>
 						</th>
 						<th scope="col">
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php
index fa5be6ebb1d97..7475047e05a2c 100644
--- a/administrator/components/com_tags/tmpl/tags/default.php
+++ b/administrator/components/com_tags/tmpl/tags/default.php
@@ -120,7 +120,7 @@
 						<th scope="col" class="w-10 d-none d-md-table-cell text-center">
 							<?php echo JHtml::_('searchtools.sort', 'COM_TAGS_COUNT_TAGGED_ITEMS', 'countTaggedItems', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-5 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
index 61ff711e9a5b9..ac164229a55b9 100644
--- a/administrator/components/com_templates/tmpl/styles/default.php
+++ b/administrator/components/com_templates/tmpl/styles/default.php
@@ -43,7 +43,7 @@
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_TEMPLATES_HEADING_STYLE', 'a.title', $listDirn, $listOrder); ?>
 								</th>
 								<?php if ($clientId === 0) : ?>
-									<th scope="col" style="width:5%" class="text-center">
+									<th scope="col" class="w-5 text-center">
 										<?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
 									</th>
 								<?php endif; ?>
@@ -58,7 +58,7 @@
 								<th scope="col" style="width:12%" class="d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.template', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 2d0dafe1a27b9..0e4a4d767754d 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -26,7 +26,7 @@
 					<table class="table">
 						<thead>
 							<tr>
-								<td style="width:5%" class="text-center">
+								<td class="w-5 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col" style="width:7%">
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index f71f4cd983f2c..93dea807cf986 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -58,14 +58,14 @@
 								<th scope="col" style="width:10%; " class="d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%;" class="text-center d-md-table-cell">
+								<th scope="col" class="w-5 text-center d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%;" class="text-center d-md-table-cell">
+								<th scope="col" class="w-5 text-center d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>
 								</th>
 								<?php if ($tfa) : ?>
-								<th scope="col" style="width:5%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-5 text-center d-none d-md-table-cell">
 									<?php echo Text::_('COM_USERS_HEADING_TFA'); ?>
 								</th>
 								<?php endif; ?>
@@ -81,7 +81,7 @@
 								<th scope="col" style="width:12%" class="d-none d-xl-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_REGISTRATION_DATE', 'a.registerDate', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:5%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/templates/atum/scss/blocks/_utilities.scss b/administrator/templates/atum/scss/blocks/_utilities.scss
index 26516afef6520..3b6ebbc7172be 100644
--- a/administrator/templates/atum/scss/blocks/_utilities.scss
+++ b/administrator/templates/atum/scss/blocks/_utilities.scss
@@ -80,6 +80,10 @@
 
 // Sizing
 
+.w-5 {
+  width: 5% !important;
+}
+
 .w-10 {
   width: 10% !important;
 }
\ No newline at end of file

From baffbcba7e574214bba045dad5c4d67f9153785d Mon Sep 17 00:00:00 2001
From: Richard Fath <richard67@users.noreply.github.com>
Date: Wed, 6 May 2020 11:18:50 +0200
Subject: [PATCH 6/9] Add extension name and id to uninstall message (#28960)

Co-authored-by: ReLater
---
 .../components/com_installer/src/Model/ManageModel.php          | 2 +-
 administrator/language/en-GB/com_installer.ini                  | 2 +-
 libraries/src/Console/ExtensionRemoveCommand.php                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
index 875d029008c32..64d19d0c290d3 100644
--- a/administrator/components/com_installer/src/Model/ManageModel.php
+++ b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -253,7 +253,7 @@ public function remove($eid = array())
 			// Do not allow to uninstall locked extensions.
 			if ((int) $row->locked === 1)
 			{
-				$msgs[] = Text::_('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION');
+				$msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION', $row->name, $id);
 
 				continue;
 			}
diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
index fc97f9bab1f2a..06d642e02fb2c 100644
--- a/administrator/language/en-GB/com_installer.ini
+++ b/administrator/language/en-GB/com_installer.ini
@@ -249,7 +249,7 @@ COM_INSTALLER_TYPE_TYPE_TEMPLATE="template"
 COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package"
 COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The Joomla package cannot be installed through the Extension Manager. Please use the <a href='%s'>Joomla! Update</a> component to update Joomla."
 COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s."
-COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="Locked extensions cannot be uninstalled."
+COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="The extension \"%1s\" (ID %2s) is locked and cannot be uninstalled."
 COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for an update ID, update site ID or extension ID."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_LABEL="Search Extensions with Updates"
diff --git a/libraries/src/Console/ExtensionRemoveCommand.php b/libraries/src/Console/ExtensionRemoveCommand.php
index 7a283dab0f727..31478e9d07564 100644
--- a/libraries/src/Console/ExtensionRemoveCommand.php
+++ b/libraries/src/Console/ExtensionRemoveCommand.php
@@ -172,7 +172,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
 			// Do not allow to uninstall locked extensions.
 			if ((int) $row->locked === 1)
 			{
-				$this->ioStyle->error(Text::_('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION'));
+				$this->ioStyle->error(Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION', $row->name, $extensionId));
 
 				return self::REMOVE_LOCKED;
 			}

From 6543bcfdff5119f1cc1fa32ba4e2e6a22a2c04fe Mon Sep 17 00:00:00 2001
From: Christiane Maier-Stadtherr <dev@chmst.de>
Date: Wed, 6 May 2020 13:22:16 +0200
Subject: [PATCH 7/9] [4.0][a11y]Make module assignment accessible - step 2
 remove alias (#28944)

---
 .../components/com_modules/tmpl/module/edit_assignment.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php
index ab45cb2e75786..4cdd78c7cffdf 100644
--- a/administrator/components/com_modules/tmpl/module/edit_assignment.php
+++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php
@@ -98,7 +98,7 @@
 										?>
 										<input type="checkbox" class="novalidate" name="jform[assigned][]" id="<?php echo $id . $link->value; ?>" value="<?php echo (int) $link->value; ?>"<?php echo $selected ? ' checked="checked"' : ''; echo $uselessMenuItem ? ' disabled="disabled"' : ''; ?>>
 										<label for="<?php echo $id . $link->value; ?>" class="">
-											<?php echo $link->text; ?> <span class="small"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($link->alias)); ?></span>
+											<?php echo $link->text; ?>
 											<?php if (Multilanguage::isEnabled() && $link->language != '' && $link->language != '*') : ?>
 												<?php if ($link->language_image) : ?>
 													<?php echo HTMLHelper::_('image', 'mod_languages/' . $link->language_image . '.gif', $link->language_title, array('title' => $link->language_title), true); ?>

From c90e527a1ca32d2b50ca177f2ca89d973d19bb76 Mon Sep 17 00:00:00 2001
From: SharkyKZ <sharkykz@gmail.com>
Date: Wed, 6 May 2020 14:42:50 +0300
Subject: [PATCH 8/9] [4.0] Fix Language Override filtering (#28946)

---
 .../components/com_languages/src/Helper/LanguagesHelper.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_languages/src/Helper/LanguagesHelper.php b/administrator/components/com_languages/src/Helper/LanguagesHelper.php
index 1f29ec2de21d8..309c293e372aa 100644
--- a/administrator/components/com_languages/src/Helper/LanguagesHelper.php
+++ b/administrator/components/com_languages/src/Helper/LanguagesHelper.php
@@ -11,6 +11,7 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\LanguageHelper;
 
 /**
@@ -32,7 +33,7 @@ class LanguagesHelper
 	 */
 	public static function filterKey($value)
 	{
-		$filter = \JFilterInput::getInstance(null, null, 1, 1);
+		$filter = InputFilter::getInstance([], [], InputFilter::TAGS_BLACKLIST, InputFilter::ATTR_BLACKLIST);
 
 		return strtoupper($filter->clean($value, 'cmd'));
 	}
@@ -49,7 +50,7 @@ public static function filterKey($value)
 	 */
 	public static function filterText($value)
 	{
-		$filter = \JFilterInput::getInstance(null, null, 1, 1);
+		$filter = InputFilter::getInstance([], [], InputFilter::TAGS_BLACKLIST, InputFilter::ATTR_BLACKLIST);
 
 		return $filter->clean($value);
 	}

From 80f1b462524d4b44c72474ea57714e2ef54796e2 Mon Sep 17 00:00:00 2001
From: SharkyKZ <sharkykz@gmail.com>
Date: Wed, 6 May 2020 14:52:45 +0300
Subject: [PATCH 9/9] [4.0] Fix validation in menu field (#28937)

Fix required field submitted without value, simplify other fields, escape value.
---
 .../com_associations/src/Field/Modal/AssociationField.php       | 2 +-
 .../components/com_categories/src/Field/Modal/CategoryField.php | 2 +-
 .../components/com_contact/src/Field/Modal/ContactField.php     | 2 +-
 .../components/com_content/src/Field/Modal/ArticleField.php     | 2 +-
 .../components/com_menus/src/Field/Modal/MenuField.php          | 2 +-
 .../components/com_newsfeeds/src/Field/Modal/NewsfeedField.php  | 2 +-
 layouts/joomla/form/field/user.php                              | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/administrator/components/com_associations/src/Field/Modal/AssociationField.php b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
index 345e4cdc29cc1..ac705d7d6c5d1 100644
--- a/administrator/components/com_associations/src/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
@@ -43,7 +43,7 @@ protected function getInput()
 	{
 		// @TODO USE JLayouts here!!!
 		// The active item id field.
-		$value = (int) $this->value > 0 ? (int) $this->value : '';
+		$value = (int) $this->value ?: '';
 
 		Factory::getDocument()->addScriptOptions('admin_associations_modal', ['itemId' => $value]);
 		HTMLHelper::_('script', 'com_associations/admin_associations_modal.min.js', ['version' => 'auto', 'relative' => true]);
diff --git a/administrator/components/com_categories/src/Field/Modal/CategoryField.php b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
index db98d1ace562e..8c87505cee91a 100644
--- a/administrator/components/com_categories/src/Field/Modal/CategoryField.php
+++ b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
@@ -64,7 +64,7 @@ protected function getInput()
 		Factory::getLanguage()->load('com_categories', JPATH_ADMINISTRATOR);
 
 		// The active category id field.
-		$value = (int) $this->value > 0 ? (int) $this->value : '';
+		$value = (int) $this->value ?: '';
 
 		// Create the modal id.
 		$modalId = 'Category_' . $this->id;
diff --git a/administrator/components/com_contact/src/Field/Modal/ContactField.php b/administrator/components/com_contact/src/Field/Modal/ContactField.php
index cda03c1ecfb0e..85e06d44be884 100644
--- a/administrator/components/com_contact/src/Field/Modal/ContactField.php
+++ b/administrator/components/com_contact/src/Field/Modal/ContactField.php
@@ -55,7 +55,7 @@ protected function getInput()
 		Factory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
 
 		// The active contact id field.
-		$value = (int) $this->value > 0 ? (int) $this->value : '';
+		$value = (int) $this->value ?: '';
 
 		// Create the modal id.
 		$modalId = 'Contact_' . $this->id;
diff --git a/administrator/components/com_content/src/Field/Modal/ArticleField.php b/administrator/components/com_content/src/Field/Modal/ArticleField.php
index 008b6fb103a1a..bf6449b474d77 100644
--- a/administrator/components/com_content/src/Field/Modal/ArticleField.php
+++ b/administrator/components/com_content/src/Field/Modal/ArticleField.php
@@ -55,7 +55,7 @@ protected function getInput()
 		Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
 
 		// The active article id field.
-		$value = ((int) $this->value) ?: '';
+		$value = (int) $this->value ?: '';
 
 		// Create the modal id.
 		$modalId = 'Article_' . $this->id;
diff --git a/administrator/components/com_menus/src/Field/Modal/MenuField.php b/administrator/components/com_menus/src/Field/Modal/MenuField.php
index 4a0fa66e36a17..8bb33d19df06c 100644
--- a/administrator/components/com_menus/src/Field/Modal/MenuField.php
+++ b/administrator/components/com_menus/src/Field/Modal/MenuField.php
@@ -172,7 +172,7 @@ protected function getInput()
 		Factory::getLanguage()->load('com_menus', JPATH_ADMINISTRATOR);
 
 		// The active article id field.
-		$value = (int) $this->value;
+		$value = (int) $this->value ?: '';
 
 		// Create the modal id.
 		$modalId = 'Item_' . $this->id;
diff --git a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
index 8073a0d655cb8..02f1c2e1f498f 100644
--- a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
+++ b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
@@ -55,7 +55,7 @@ protected function getInput()
 		Factory::getLanguage()->load('com_newsfeeds', JPATH_ADMINISTRATOR);
 
 		// The active newsfeed id field.
-		$value = (int) $this->value > 0 ? (int) $this->value : '';
+		$value = (int) $this->value ?: '';
 
 		// Create the modal id.
 		$modalId = 'Newsfeed_' . $this->id;
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index e071738f972bd..1c52121913f90 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -122,7 +122,7 @@
 	</div>
 	<?php // Create the real field, hidden, that stored the user id. ?>
 	<?php if (!$readonly) : ?>
-		<input type="hidden" id="<?php echo $id; ?>_id" name="<?php echo $name; ?>" value="<?php echo $value; ?>"
+		<input type="hidden" id="<?php echo $id; ?>_id" name="<?php echo $name; ?>" value="<?php echo $this->escape($value); ?>"
 			class="field-user-input <?php echo $class ? (string) $class : ''?>"
 			data-onchange="<?php echo $this->escape($onchange); ?>">
 		<?php echo HTMLHelper::_(