From 85d3d801c171b06dbca55a16be1edb887a2319d7 Mon Sep 17 00:00:00 2001
From: bembelimen <benjamin.trenkle@wicked-chick.de>
Date: Fri, 19 Jun 2020 00:12:47 +0200
Subject: [PATCH 1/4] Remove whitelist/blacklist terms

---
 .../com_config/src/Field/FiltersField.php     | 15 ++--
 administrator/language/en-GB/com_config.ini   | 12 ++-
 administrator/language/en-GB/com_cpanel.ini   |  2 +-
 administrator/language/en-GB/com_media.ini    |  2 +-
 administrator/language/en-GB/joomla.ini       | 10 +--
 api/language/en-GB/joomla.ini                 | 10 +--
 language/en-GB/com_media.ini                  |  2 +-
 libraries/src/Component/ComponentHelper.php   | 83 ++++++++---------
 libraries/src/MVC/Model/ListModel.php         | 34 +++++--
 .../src/Workflow/WorkflowPluginTrait.php      | 16 ++--
 plugins/editors/tinymce/tinymce.php           | 90 ++++++++++---------
 plugins/workflow/featuring/featuring.php      |  6 +-
 plugins/workflow/featuring/featuring.xml      | 12 +--
 .../workflow/notification/notification.php    |  2 +-
 .../workflow/notification/notification.xml    | 12 +--
 plugins/workflow/publishing/publishing.php    |  6 +-
 plugins/workflow/publishing/publishing.xml    | 12 +--
 17 files changed, 179 insertions(+), 147 deletions(-)

diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index 811e0e6b18e2c..9370d2393d2f7 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -141,12 +141,15 @@ protected function getInput()
 				. ' data-id="' . ($group->value) . '" '
 				. ' class="novalidate custom-select"'
 				. '>';
-			$html[] = '					<option value="BL"' . ($group_filter['filter_type'] == 'BL' ? ' selected="selected"' : '') . '>'
-				. Text::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST') . '</option>';
-			$html[] = '					<option value="CBL"' . ($group_filter['filter_type'] == 'CBL' ? ' selected="selected"' : '') . '>'
-				. Text::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST') . '</option>';
-			$html[] = '					<option value="WL"' . ($group_filter['filter_type'] == 'WL' ? ' selected="selected"' : '') . '>'
-				. Text::_('COM_CONFIG_FIELD_FILTERS_WHITE_LIST') . '</option>';
+				// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+			$html[] = '					<option value="DL"' . (in_array($group_filter['filter_type'], ['BL', 'DL']) ? ' selected="selected"' : '') . '>'
+				. Text::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_ALLOW_LIST') . '</option>';
+				// "CBL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+			$html[] = '					<option value="CDL"' . (in_array($group_filter['filter_type'], ['CBL', 'CDL']) ? ' selected="selected"' : '') . '>'
+				. Text::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_DISALLOW_LIST') . '</option>';
+				// "WL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+			$html[] = '					<option value="AL"' . (in_array($group_filter['filter_type'], ['WL', 'AL']) ? ' selected="selected"' : '') . '>'
+				. Text::_('COM_CONFIG_FIELD_FILTERS_ALLOW_LIST') . '</option>';
 			$html[] = '					<option value="NH"' . ($group_filter['filter_type'] == 'NH' ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_NO_HTML') . '</option>';
 			$html[] = '					<option value="NONE"' . ($group_filter['filter_type'] == 'NONE' ? ' selected="selected"' : '') . '>'
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index 5f375e537f8e1..e5542d2a35e72 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -70,11 +70,17 @@ 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"
-COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Blacklist"
-COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default Blacklist"
+COM_CONFIG_FIELD_FILTERS_CUSTOM_DISALLOW_LIST="Custom DisallowList"
+COM_CONFIG_FIELD_FILTERS_DEFAULT_DISALLOW_LIST="Default DisallowList"
+; Deprecate in Joomla! 4, remove in Joomla! 5
+COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom DisallowList"
+; Deprecate in Joomla! 4, remove in Joomla! 5
+COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default DisallowList"
 COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering"
 COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML"
-COM_CONFIG_FIELD_FILTERS_WHITE_LIST="Whitelist"
+COM_CONFIG_FIELD_FILTERS_ALLOW_LIST="AllowList"
+; Deprecate in Joomla! 4, remove in Joomla! 5
+COM_CONFIG_FIELD_FILTERS_WHITE_LIST="AllowList"
 COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_FTP_ENABLE_LABEL="Enable FTP"
 COM_CONFIG_FIELD_FTP_HOST_LABEL="FTP Host"
diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini
index b072d5fe8de56..c45bc615a7163 100644
--- a/administrator/language/en-GB/com_cpanel.ini
+++ b/administrator/language/en-GB/com_cpanel.ini
@@ -30,7 +30,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_UPDATEDEFAULTSETTINGS_BODY="<p>As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site.</p><p>The changed settings are:</p><ul><li>Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default Blacklist\"</li><li>Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default</li><li>Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded</li><li>Articles > Show Email: The option to show an email icon with articles is disabled by default</li></ul><p>We have created a <a href=\"https://docs.joomla.org/Special:MyLanguage/J3.x:Joomla_3.8.8_notes_about_the_changed_default_settings\">dedicated documentation page</a> explaining these changes.</p>"
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="<p>As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site.</p><p>The changed settings are:</p><ul><li>Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default DisallowList\"</li><li>Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default</li><li>Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded</li><li>Articles > Show Email: The option to show an email icon with articles is disabled by default</li></ul><p>We have created a <a href=\"https://docs.joomla.org/Special:MyLanguage/J3.x:Joomla_3.8.8_notes_about_the_changed_default_settings\">dedicated documentation page</a> explaining these changes.</p>"
 COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini
index f10bba9a1a761..63289916d3bb7 100644
--- a/administrator/language/en-GB/com_media.ini
+++ b/administrator/language/en-GB/com_media.ini
@@ -32,7 +32,7 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify
 COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
 COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
 COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
-COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload (blacklist)."
+COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload."
 COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Illegal MIME Types"
 COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)."
 COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)"
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 2f5cc78f4722a..20562bc4e760d 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -432,7 +432,7 @@ JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters appl
 JGLOBAL_FILTER_GROUPS_LABEL="Filter Groups"
 JGLOBAL_FILTER_TAGS_DESC="2. List additional tags, separating each tag name with a space or comma. For example: <em>p,div,span</em>."
 JGLOBAL_FILTER_TAGS_LABEL="Filter Tags<sup>2</sup>"
-JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.<br><strong>--</strong> Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.</p><p>Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br>Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
+JGLOBAL_FILTER_TYPE_DESC="1. DisallowList allows all tags and attributes except for those in the disallow list.<br><strong>--</strong> Tags for the Default DisallowList include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default DisallowList include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can disallow additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom DisallowList allows you to override the Default DisallowList. Add the tags and attributes to be disallowed in the Filter Tags and Filter Attributes fields.</p><p>AllowList allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br>Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
 JGLOBAL_FILTER_TYPE_LABEL="Filter Type<sup>1</sup>"
 JGLOBAL_FILTERED_BY="Filtered by:"
 JGLOBAL_FULL_TEXT="Full Text"
@@ -1000,10 +1000,10 @@ JWARNING_UNPUBLISH_MUST_SELECT="You must select at least one item to unpublish."
 JWORKFLOW="Workflow: %s"
 JWORKFLOW_ENABLED_LABEL="Enable Workflow"
 JWORKFLOW_EXECUTE_TRANSITION="Select the transition to execute on this item."
-JWORKFLOW_EXTENSION_BLACKLIST_DESCRIPTION="Disable this plugin for listed extensions."
-JWORKFLOW_EXTENSION_BLACKLIST_LABEL="Extension Blacklist"
-JWORKFLOW_EXTENSION_WHITELIST_DESCRIPTION="Activate this plugin only for listed extensions. If used all other extensions are disabled."
-JWORKFLOW_EXTENSION_WHITELIST_LABEL="Extension Whitelist"
+JWORKFLOW_EXTENSION_DISALLOW_LIST_DESCRIPTION="Disable this plugin for listed extensions."
+JWORKFLOW_EXTENSION_DISALLOW_LIST_LABEL="Extension DisallowList"
+JWORKFLOW_EXTENSION_ALLOW_LIST_DESCRIPTION="Activate this plugin only for listed extensions. If used all other extensions are disabled."
+JWORKFLOW_EXTENSION_ALLOW_LIST_LABEL="Extension AllowList"
 JWORKFLOW_FIELD_COMPONENT_SECTIONS_TEXT="%1$s: %2$s"
 JWORKFLOW_SHOW_TRANSITIONS_FOR_THIS_ITEM="Show the transition selection to execute a transition on this item."
 JWORKFLOW_TITLE="Workflow"
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 2f5cc78f4722a..45e721921063f 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -432,7 +432,7 @@ JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters appl
 JGLOBAL_FILTER_GROUPS_LABEL="Filter Groups"
 JGLOBAL_FILTER_TAGS_DESC="2. List additional tags, separating each tag name with a space or comma. For example: <em>p,div,span</em>."
 JGLOBAL_FILTER_TAGS_LABEL="Filter Tags<sup>2</sup>"
-JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.<br><strong>--</strong> Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.</p><p>Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br>Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
+JGLOBAL_FILTER_TYPE_DESC="1. DisallowList allows all tags and attributes except for those in the disallowList.<br><strong>--</strong> Tags for the Default DisallowList include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default DisallowList include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can disallow additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom DisallowList allows you to override the Default DisallowList. Add the tags and attributes to be disallowed in the Filter Tags and Filter Attributes fields.</p><p>AllowList allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br>Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
 JGLOBAL_FILTER_TYPE_LABEL="Filter Type<sup>1</sup>"
 JGLOBAL_FILTERED_BY="Filtered by:"
 JGLOBAL_FULL_TEXT="Full Text"
@@ -1000,10 +1000,10 @@ JWARNING_UNPUBLISH_MUST_SELECT="You must select at least one item to unpublish."
 JWORKFLOW="Workflow: %s"
 JWORKFLOW_ENABLED_LABEL="Enable Workflow"
 JWORKFLOW_EXECUTE_TRANSITION="Select the transition to execute on this item."
-JWORKFLOW_EXTENSION_BLACKLIST_DESCRIPTION="Disable this plugin for listed extensions."
-JWORKFLOW_EXTENSION_BLACKLIST_LABEL="Extension Blacklist"
-JWORKFLOW_EXTENSION_WHITELIST_DESCRIPTION="Activate this plugin only for listed extensions. If used all other extensions are disabled."
-JWORKFLOW_EXTENSION_WHITELIST_LABEL="Extension Whitelist"
+JWORKFLOW_EXTENSION_DISALLOW_LIST_DESCRIPTION="Disable this plugin for listed extensions."
+JWORKFLOW_EXTENSION_DISALLOW_LIST_LABEL="Extension DisallowList"
+JWORKFLOW_EXTENSION_ALLOW_LIST_DESCRIPTION="Activate this plugin only for listed extensions. If used all other extensions are disabled."
+JWORKFLOW_EXTENSION_ALLOW_LIST_LABEL="Extension AllowList"
 JWORKFLOW_FIELD_COMPONENT_SECTIONS_TEXT="%1$s: %2$s"
 JWORKFLOW_SHOW_TRANSITIONS_FOR_THIS_ITEM="Show the transition selection to execute a transition on this item."
 JWORKFLOW_TITLE="Workflow"
diff --git a/language/en-GB/com_media.ini b/language/en-GB/com_media.ini
index 61a1fa3dd278e..0f448d4db6f85 100644
--- a/language/en-GB/com_media.ini
+++ b/language/en-GB/com_media.ini
@@ -54,7 +54,7 @@ COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify fil
 COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
 COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
 COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
-COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload (blacklist)."
+COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload."
 COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Illegal MIME Types"
 COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)."
 COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)"
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index 298649dd6ff49..ecf2de0014fac 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/libraries/src/Component/ComponentHelper.php
@@ -133,17 +133,17 @@ public static function filterText($text)
 
 		$filters = $config->get('filters');
 
-		$blackListTags       = array();
-		$blackListAttributes = array();
+		$disallowedTags       = array();
+		$disallowedAttributes = array();
 
 		$customListTags       = array();
 		$customListAttributes = array();
 
-		$whiteListTags       = array();
-		$whiteListAttributes = array();
+		$allowedTags       = array();
+		$allowedAttributes = array();
 
-		$whiteList  = false;
-		$blackList  = false;
+		$allowList  = false;
+		$disallowList  = false;
 		$customList = false;
 		$unfiltered = false;
 
@@ -172,7 +172,7 @@ public static function filterText($text)
 			}
 			else
 			{
-				// Blacklist or whitelist.
+				// DisallowList or AllowList.
 				// Preprocess the tags and attributes.
 				$tags           = explode(',', $filterData->filter_tags);
 				$attributes     = explode(',', $filterData->filter_attributes);
@@ -199,15 +199,17 @@ public static function filterText($text)
 					}
 				}
 
-				// Collect the blacklist or whitelist tags and attributes.
+				// Collect the disallowList or allowlist tags and attributes.
 				// Each list is cumulative.
-				if ($filterType === 'BL')
+				// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+				if (in_array($filterType, ['BL', 'DL']))
 				{
-					$blackList           = true;
-					$blackListTags       = array_merge($blackListTags, $tempTags);
-					$blackListAttributes = array_merge($blackListAttributes, $tempAttributes);
+					$disallowList         = true;
+					$disallowedTags       = array_merge($disallowedTags, $tempTags);
+					$disallowedAttributes = array_merge($disallowedAttributes, $tempAttributes);
 				}
-				elseif ($filterType === 'CBL')
+				// "CBL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+				elseif (in_array($filterType, ['CBL', 'CAL']))
 				{
 					// Only set to true if Tags or Attributes were added
 					if ($tempTags || $tempAttributes)
@@ -217,31 +219,32 @@ public static function filterText($text)
 						$customListAttributes = array_merge($customListAttributes, $tempAttributes);
 					}
 				}
-				elseif ($filterType === 'WL')
+				// "WL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+				elseif (in_array($filterType, ['WL', 'AL']))
 				{
-					$whiteList           = true;
-					$whiteListTags       = array_merge($whiteListTags, $tempTags);
-					$whiteListAttributes = array_merge($whiteListAttributes, $tempAttributes);
+					$allowList       = true;
+					$allowedTags       = array_merge($allowedTags, $tempTags);
+					$allowedAttributes = array_merge($allowedAttributes, $tempAttributes);
 				}
 			}
 		}
 
-		// Remove duplicates before processing (because the blacklist uses both sets of arrays).
-		$blackListTags        = array_unique($blackListTags);
-		$blackListAttributes  = array_unique($blackListAttributes);
+		// Remove duplicates before processing (because the disallowlist uses both sets of arrays).
+		$disallowedTags        = array_unique($disallowedTags);
+		$disallowedAttributes  = array_unique($disallowedAttributes);
 		$customListTags       = array_unique($customListTags);
 		$customListAttributes = array_unique($customListAttributes);
-		$whiteListTags        = array_unique($whiteListTags);
-		$whiteListAttributes  = array_unique($whiteListAttributes);
+		$allowedTags        = array_unique($allowedTags);
+		$allowedAttributes  = array_unique($allowedAttributes);
 
 		if (!$unfiltered)
 		{
-			// Custom blacklist precedes Default blacklist
+			// Custom disallowlist precedes Default disallowlist
 			if ($customList)
 			{
 				$filter = InputFilter::getInstance(array(), array(), 1, 1);
 
-				// Override filter's default blacklist tags and attributes
+				// Override filter's default disallowlist tags and attributes
 				if ($customListTags)
 				{
 					$filter->blockedTags = $customListTags;
@@ -252,37 +255,37 @@ public static function filterText($text)
 					$filter->blockedAttributes = $customListAttributes;
 				}
 			}
-			// Blacklists take second precedence.
-			elseif ($blackList)
+			// DisallowList take second precedence.
+			elseif ($disallowList)
 			{
-				// Remove the whitelisted tags and attributes from the black-list.
-				$blackListTags       = array_diff($blackListTags, $whiteListTags);
-				$blackListAttributes = array_diff($blackListAttributes, $whiteListAttributes);
+				// Remove the allowed tags and attributes from the disallowList.
+				$disallowedTags       = array_diff($disallowedTags, $allowedTags);
+				$disallowedAttributes = array_diff($disallowedAttributes, $allowedAttributes);
 
 				$filter = InputFilter::getInstance(
-					$blackListTags,
-					$blackListAttributes,
+					$disallowedTags,
+					$disallowedAttributes,
 					InputFilter::ONLY_BLOCK_DEFINED_TAGS,
 					InputFilter::ONLY_BLOCK_DEFINED_ATTRIBUTES
 				);
 
-				// Remove whitelisted tags from filter's default blacklist
-				if ($whiteListTags)
+				// Remove allowed tags from filter's default disallowList
+				if ($allowedTags)
 				{
-					$filter->blockedTags = array_diff($filter->blockedTags, $whiteListTags);
+					$filter->blockedTags = array_diff($filter->blockedTags, $allowedTags);
 				}
 
-				// Remove whitelisted attributes from filter's default blacklist
-				if ($whiteListAttributes)
+				// Remove allowed attributes from filter's default disallowList
+				if ($allowedAttributes)
 				{
-					$filter->blockedAttributes = array_diff($filter->blockedAttributes, $whiteListAttributes);
+					$filter->blockedAttributes = array_diff($filter->blockedAttributes, $allowedAttributes);
 				}
 			}
-			// Whitelists take third precedence.
-			elseif ($whiteList)
+			// AllowLists take third precedence.
+			elseif ($allowList)
 			{
 				// Turn off XSS auto clean
-				$filter = InputFilter::getInstance($whiteListTags, $whiteListAttributes, 0, 0, 0);
+				$filter = InputFilter::getInstance($allowedTags, $allowedAttributes, 0, 0, 0);
 			}
 			// No HTML takes last place.
 			else
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index e03de8bf7eaec..9735348864eae 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -78,21 +78,39 @@ class ListModel extends BaseDatabaseModel implements ListModelInterface
 	protected $htmlFormName = 'adminForm';
 
 	/**
-	 * A blacklist of filter variables to not merge into the model's state
+	 * A list of filter variables to not merge into the model's state
 	 *
-	 * @var    array
-	 * @since  3.4.5
+	 * @var        array
+	 * @since      3.4.5
+	 * @deprecated 4.0.0 use $filterDisallowList instead
 	 */
 	protected $filterBlacklist = array();
 
 	/**
-	 * A blacklist of list variables to not merge into the model's state
+	 * A list of filter variables to not merge into the model's state
+	 *
+	 * @var        array
+	 * @since      3.4.5
+	 */
+	protected $filterDisallowList = array();
+
+	/**
+	 * A list of variables to not merge into the model's state
 	 *
 	 * @var    array
 	 * @since  3.4.5
+	 * @deprecated 4.0.0 use $listDisallowList instead
 	 */
 	protected $listBlacklist = array('select');
 
+	/**
+	 * A list of variables to not merge into the model's state
+	 *
+	 * @var    array
+	 * @since  3.4.5
+	 */
+	protected $listDisallowList = array('select');
+
 	/**
 	 * Constructor
 	 *
@@ -426,8 +444,8 @@ protected function populateState($ordering = null, $direction = null)
 			{
 				foreach ($filters as $name => $value)
 				{
-					// Exclude if blacklisted
-					if (!\in_array($name, $this->filterBlacklist))
+					// Exclude if disallowed
+					if (!\in_array($name, $this->filterDisallowList))
 					{
 						$this->setState('filter.' . $name, $value);
 					}
@@ -441,8 +459,8 @@ protected function populateState($ordering = null, $direction = null)
 			{
 				foreach ($list as $name => $value)
 				{
-					// Exclude if blacklisted
-					if (!\in_array($name, $this->listBlacklist))
+					// Exclude if disallowed
+					if (!\in_array($name, $this->listDisallowList))
 					{
 						// Extra validations
 						switch ($name)
diff --git a/libraries/src/Workflow/WorkflowPluginTrait.php b/libraries/src/Workflow/WorkflowPluginTrait.php
index d374a8588e09a..14ad396ecb6ab 100644
--- a/libraries/src/Workflow/WorkflowPluginTrait.php
+++ b/libraries/src/Workflow/WorkflowPluginTrait.php
@@ -92,20 +92,20 @@ protected function isSupported($context)
 	}
 
 	/**
-	 * Check if the context is listed in the whitelist or in the blacklist and return the result
+	 * Check if the context is listed in the AllowedList or in the DisallowedList and return the result
 	 *
 	 * @param   string $context Context to check
 	 *
 	 * @return boolean
 	 */
-	protected function checkWhiteAndBlacklist($context)
+	protected function checkAllowAndDisallow($context)
 	{
-		$whitelist = \array_filter((array) $this->params->get('whitelist', []));
-		$blacklist = \array_filter((array) $this->params->get('blacklist', []));
+		$allowList = \array_filter((array) $this->params->get('allowlist', []));
+		$disallowList = \array_filter((array) $this->params->get('disallowlist', []));
 
-		if (!empty($whitelist))
+		if (!empty($allowList))
 		{
-			foreach ($whitelist as $allowed)
+			foreach ($allowList as $allowed)
 			{
 				if ($context === $allowed)
 				{
@@ -116,7 +116,7 @@ protected function checkWhiteAndBlacklist($context)
 			return false;
 		}
 
-		foreach ($blacklist as $forbidden)
+		foreach ($disallowList as $forbidden)
 		{
 			if ($context === $forbidden)
 			{
@@ -128,7 +128,7 @@ protected function checkWhiteAndBlacklist($context)
 	}
 
 	/**
-	 * Check if the context is listed in the whitelist or in the blacklist and return the result
+	 * Check if the context supports a specific functionality
 	 *
 	 * @param   string  $context       Context to check
 	 * @param   string  $functionality The funcationality
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 382e11e982fef..34927e383c78d 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -358,7 +358,7 @@ public function onDisplay(
 
 			$invalid_elements  = implode(',', array_merge($blockedTags, $blockedAttributes, $tagArray, $attrArray));
 
-			// Valid elements are all whitelist entries in com_config, which are now missing in the filter blocked properties
+			// Valid elements are all allowed entries in com_config, which are now missing in the filter blocked properties
 			$default_filter = InputFilter::getInstance();
 			$valid_elements = implode(',', array_diff($default_filter->blockedTags, $blockedTags));
 
@@ -740,19 +740,19 @@ protected static function getGlobalFilters()
 
 		$filters = $config->get('filters');
 
-		$blackListTags        = array();
-		$blackListAttributes  = array();
+		$disallowListTags        = array();
+		$disallowListAttributes  = array();
 
 		$customListTags       = array();
 		$customListAttributes = array();
 
-		$whiteListTags        = array();
-		$whiteListAttributes  = array();
+		$allowListTags        = array();
+		$allowListAttributes  = array();
 
-		$whiteList  = false;
-		$blackList  = false;
-		$customList = false;
-		$unfiltered = false;
+		$allowList     = false;
+		$disallowList  = false;
+		$customList    = false;
+		$unfiltered    = false;
 
 		// Cycle through each of the user groups the user is in.
 		// Remember they are included in the public group as well.
@@ -779,7 +779,7 @@ protected static function getGlobalFilters()
 			}
 			else
 			{
-				// Blacklist or whitelist.
+				// DisallowList or AllowList.
 				// Preprocess the tags and attributes.
 				$tags           = explode(',', $filterData->filter_tags);
 				$attributes     = explode(',', $filterData->filter_attributes);
@@ -806,15 +806,17 @@ protected static function getGlobalFilters()
 					}
 				}
 
-				// Collect the blacklist or whitelist tags and attributes.
+				// Collect the disallowed or allowed tags and attributes.
 				// Each list is cumulative.
-				if ($filterType === 'BL')
+				// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+				if (in_array($filterType,  ['BL', 'DL']))
 				{
-					$blackList           = true;
-					$blackListTags       = array_merge($blackListTags, $tempTags);
-					$blackListAttributes = array_merge($blackListAttributes, $tempAttributes);
+					$disallowList           = true;
+					$disallowListTags       = array_merge($disallowListTags, $tempTags);
+					$disallowListAttributes = array_merge($disallowListAttributes, $tempAttributes);
 				}
-				elseif ($filterType === 'CBL')
+				// "CBL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+				elseif (in_array($filterType, ['CBL', 'CDL']))
 				{
 					// Only set to true if Tags or Attributes were added
 					if ($tempTags || $tempAttributes)
@@ -824,22 +826,22 @@ protected static function getGlobalFilters()
 						$customListAttributes = array_merge($customListAttributes, $tempAttributes);
 					}
 				}
-				elseif ($filterType === 'WL')
+				elseif (in_array($filterType, ['WL', 'AL']))
 				{
-					$whiteList           = true;
-					$whiteListTags       = array_merge($whiteListTags, $tempTags);
-					$whiteListAttributes = array_merge($whiteListAttributes, $tempAttributes);
+					$allowList           = true;
+					$allowListTags       = array_merge($allowListTags, $tempTags);
+					$allowListAttributes = array_merge($allowListAttributes, $tempAttributes);
 				}
 			}
 		}
 
-		// Remove duplicates before processing (because the blacklist uses both sets of arrays).
-		$blackListTags        = array_unique($blackListTags);
-		$blackListAttributes  = array_unique($blackListAttributes);
-		$customListTags       = array_unique($customListTags);
-		$customListAttributes = array_unique($customListAttributes);
-		$whiteListTags        = array_unique($whiteListTags);
-		$whiteListAttributes  = array_unique($whiteListAttributes);
+		// Remove duplicates before processing (because the disallowList uses both sets of arrays).
+		$disallowListTags        = array_unique($disallowListTags);
+		$disallowListAttributes  = array_unique($disallowListAttributes);
+		$customListTags          = array_unique($customListTags);
+		$customListAttributes    = array_unique($customListAttributes);
+		$allowListTags           = array_unique($allowListTags);
+		$allowListAttributes     = array_unique($allowListAttributes);
 
 		// Unfiltered assumes first priority.
 		if ($unfiltered)
@@ -849,12 +851,12 @@ protected static function getGlobalFilters()
 		}
 		else
 		{
-			// Custom blacklist precedes Default blacklist
+			// Custom disallowList precedes Default disallowList
 			if ($customList)
 			{
 				$filter = InputFilter::getInstance([], [], 1, 1);
 
-				// Override filter's default blacklist tags and attributes
+				// Override filter's default disallowList tags and attributes
 				if ($customListTags)
 				{
 					$filter->blockedTags = $customListTags;
@@ -865,32 +867,32 @@ protected static function getGlobalFilters()
 					$filter->blockedAttributes = $customListAttributes;
 				}
 			}
-			// Blacklists take second precedence.
-			elseif ($blackList)
+			// DisallowList take second precedence.
+			elseif ($disallowList)
 			{
-				// Remove the white-listed tags and attributes from the black-list.
-				$blackListTags       = array_diff($blackListTags, $whiteListTags);
-				$blackListAttributes = array_diff($blackListAttributes, $whiteListAttributes);
+				// Remove the allowed tags and attributes from the disallowList.
+				$disallowListTags       = array_diff($disallowListTags, $allowListTags);
+				$disallowListAttributes = array_diff($disallowListAttributes, $allowListAttributes);
 
-				$filter = InputFilter::getInstance($blackListTags, $blackListAttributes, 1, 1);
+				$filter = InputFilter::getInstance($disallowListTags, $disallowListAttributes, 1, 1);
 
-				// Remove whitelisted tags from filter's default blacklist
-				if ($whiteListTags)
+				// Remove allowed tags from filter's default disallowList
+				if ($allowListTags)
 				{
-					$filter->blockedTags = array_diff($filter->blockedTags, $whiteListTags);
+					$filter->blockedTags = array_diff($filter->blockedTags, $allowListTags);
 				}
 
-				// Remove whitelisted attributes from filter's default blacklist
-				if ($whiteListAttributes)
+				// Remove allowed attributes from filter's default disallowList
+				if ($allowListAttributes)
 				{
-					$filter->blockedAttributes = array_diff($filter->blockedAttributes, $whiteListAttributes);
+					$filter->blockedAttributes = array_diff($filter->blockedAttributes, $allowListAttributes);
 				}
 			}
-			// Whitelists take third precedence.
-			elseif ($whiteList)
+			// AlloedList take third precedence.
+			elseif ($allowList)
 			{
 				// Turn off XSS auto clean
-				$filter = InputFilter::getInstance($whiteListTags, $whiteListAttributes, 0, 0, 0);
+				$filter = InputFilter::getInstance($allowListTags, $allowListAttributes, 0, 0, 0);
 			}
 			// No HTML takes last place.
 			else
diff --git a/plugins/workflow/featuring/featuring.php b/plugins/workflow/featuring/featuring.php
index 7d15e868a56ef..995ba3409faea 100644
--- a/plugins/workflow/featuring/featuring.php
+++ b/plugins/workflow/featuring/featuring.php
@@ -293,7 +293,7 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
 			)
 		);
 
-		// Release whitelist, the job is done
+		// Release allowed pks, the job is done
 		$this->app->set('plgWorkflowFeaturing.' . $context, []);
 
 		if ($eventResult->getArgument('abort'))
@@ -367,7 +367,7 @@ public function onContentBeforeChangeFeatured(FeatureEvent $event)
 			return true;
 		}
 
-		// We have whitelisted the pks, so we're the one who triggered
+		// We have allowed the pks, so we're the one who triggered
 		// With onWorkflowBeforeTransition => free pass
 		if ($this->app->get('plgWorkflowFeaturing.' . $extension) === $pks)
 		{
@@ -431,7 +431,7 @@ public function onContentBeforeSave(EventInterface $event)
 	 */
 	protected function isSupported($context)
 	{
-		if (!$this->checkWhiteAndBlacklist($context) || !$this->checkExtensionSupport($context, $this->supportFunctionality))
+		if (!$this->checkAllowAndDisallow($context) || !$this->checkExtensionSupport($context, $this->supportFunctionality))
 		{
 			return false;
 		}
diff --git a/plugins/workflow/featuring/featuring.xml b/plugins/workflow/featuring/featuring.xml
index 21351c753ecd8..25f2a0822f2f7 100644
--- a/plugins/workflow/featuring/featuring.xml
+++ b/plugins/workflow/featuring/featuring.xml
@@ -21,18 +21,18 @@
 		<fields name="params">
 			<fieldset name="basic">
 				<field
-					name="whitelist"
+					name="allowlist"
 					type="WorkflowComponentSections"
-					label="JWORKFLOW_EXTENSION_WHITELIST_LABEL"
-					description="JWORKFLOW_EXTENSION_WHITELIST_DESCRIPTION"
+					label="JWORKFLOW_EXTENSION_ALLOW_LIST_LABEL"
+					description="JWORKFLOW_EXTENSION_ALLOW_LIST_DESCRIPTION"
 					multiple="multiple"
 					layout="joomla.form.field.list-fancy-select"
 				/>
 				<field
-					name="blacklist"
+					name="disallowlist"
 					type="WorkflowComponentSections"
-					label="JWORKFLOW_EXTENSION_BLACKLIST_LABEL"
-					description="JWORKFLOW_EXTENSION_BLACKLIST_DESCRIPTION"
+					label="JWORKFLOW_EXTENSION_DISALLOW_LIST_LABEL"
+					description="JWORKFLOW_EXTENSION_DISALLOW_LIST_DESCRIPTION"
 					multiple="multiple"
 					layout="joomla.form.field.list-fancy-select"
 				/>
diff --git a/plugins/workflow/notification/notification.php b/plugins/workflow/notification/notification.php
index f92a3499fb355..b356ff98629b0 100644
--- a/plugins/workflow/notification/notification.php
+++ b/plugins/workflow/notification/notification.php
@@ -286,7 +286,7 @@ private function getUsersFromGroup($data): Array
 	 */
 	protected function isSupported($context)
 	{
-		if (!$this->checkWhiteAndBlacklist($context))
+		if (!$this->checkAllowAndDisallow($context))
 		{
 			return false;
 		}
diff --git a/plugins/workflow/notification/notification.xml b/plugins/workflow/notification/notification.xml
index 02ad291341448..16b72eb41df72 100644
--- a/plugins/workflow/notification/notification.xml
+++ b/plugins/workflow/notification/notification.xml
@@ -21,18 +21,18 @@
 		<fields name="params">
 			<fieldset name="basic">
 				<field
-					name="whitelist"
+					name="allowlist"
 					type="WorkflowComponentSections"
-					label="JWORKFLOW_EXTENSION_WHITELIST_LABEL"
-					description="JWORKFLOW_EXTENSION_WHITELIST_DESCRIPTION"
+					label="JWORKFLOW_EXTENSION_ALLOW_LIST_LABEL"
+					description="JWORKFLOW_EXTENSION_ALLOW_LIST_DESCRIPTION"
 					multiple="multiple"
 					layout="joomla.form.field.list-fancy-select"
 				/>
 				<field
-					name="blacklist"
+					name="disallowlist"
 					type="WorkflowComponentSections"
-					label="JWORKFLOW_EXTENSION_BLACKLIST_LABEL"
-					description="JWORKFLOW_EXTENSION_BLACKLIST_DESCRIPTION"
+					label="JWORKFLOW_EXTENSION_DISALLOW_LIST_LABEL"
+					description="JWORKFLOW_EXTENSION_DISALLOW_LIST_DESCRIPTION"
 					multiple="multiple"
 					layout="joomla.form.field.list-fancy-select"
 				/>
diff --git a/plugins/workflow/publishing/publishing.php b/plugins/workflow/publishing/publishing.php
index 67a187745a132..95a06310dff27 100644
--- a/plugins/workflow/publishing/publishing.php
+++ b/plugins/workflow/publishing/publishing.php
@@ -304,7 +304,7 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
 			]
 		);
 
-		// Release whitelist, the job is done
+		// Release allowed pks, the job is done
 		$this->app->set('plgWorkflowPublishing.' . $context, []);
 
 		if (\in_array(false, $result, true))
@@ -378,7 +378,7 @@ public function onContentBeforeChangeState(EventInterface $event)
 			return true;
 		}
 
-		// We have whitelisted the pks, so we're the one who triggered
+		// We have allowed the pks, so we're the one who triggered
 		// With onWorkflowBeforeTransition => free pass
 		if ($this->app->get('plgWorkflowPublishing.' . $context) === $pks)
 		{
@@ -442,7 +442,7 @@ public function onContentBeforeSave(EventInterface $event)
 	 */
 	protected function isSupported($context)
 	{
-		if (!$this->checkWhiteAndBlacklist($context) || !$this->checkExtensionSupport($context, $this->supportFunctionality))
+		if (!$this->checkAllowAndDisallow($context) || !$this->checkExtensionSupport($context, $this->supportFunctionality))
 		{
 			return false;
 		}
diff --git a/plugins/workflow/publishing/publishing.xml b/plugins/workflow/publishing/publishing.xml
index e2ec06451f3df..9ced9f9a355ca 100644
--- a/plugins/workflow/publishing/publishing.xml
+++ b/plugins/workflow/publishing/publishing.xml
@@ -21,18 +21,18 @@
 		<fields name="params">
 			<fieldset name="basic">
 				<field
-					name="whitelist"
+					name="allowlist"
 					type="WorkflowComponentSections"
-					label="JWORKFLOW_EXTENSION_WHITELIST_LABEL"
-					description="JWORKFLOW_EXTENSION_WHITELIST_DESCRIPTION"
+					label="JWORKFLOW_EXTENSION_ALLOW_LIST_LABEL"
+					description="JWORKFLOW_EXTENSION_ALLOW_LIST_DESCRIPTION"
 					multiple="multiple"
 					layout="joomla.form.field.list-fancy-select"
 				/>
 				<field
-					name="blacklist"
+					name="disallowlist"
 					type="WorkflowComponentSections"
-					label="JWORKFLOW_EXTENSION_BLACKLIST_LABEL"
-					description="JWORKFLOW_EXTENSION_BLACKLIST_DESCRIPTION"
+					label="JWORKFLOW_EXTENSION_DISALLOW_LIST_LABEL"
+					description="JWORKFLOW_EXTENSION_DISALLOW_LIST_DESCRIPTION"
 					multiple="multiple"
 					layout="joomla.form.field.list-fancy-select"
 				/>

From eb52ca37ec30d3ba6fb304d566f2f7018a190f03 Mon Sep 17 00:00:00 2001
From: bembelimen <benjamin.trenkle@wicked-chick.de>
Date: Fri, 19 Jun 2020 00:17:09 +0200
Subject: [PATCH 2/4] Fix class variable loading

---
 libraries/src/MVC/Model/ListModel.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index 9735348864eae..ded4e29b31b72 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -135,6 +135,18 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 		{
 			$this->context = strtolower($this->option . '.' . $this->getName());
 		}
+
+		// @deprecated in 4.0 remove in Joomla 5.0
+		if (!empty($this->filterBlacklist))
+		{
+			$this->filterDisallowList = array_merge($this->filterBlacklist, $this->filterDisallowList);
+		}
+
+		// @deprecated in 4.0 remove in Joomla 5.0
+		if (!empty($this->listBlacklist))
+		{
+			$this->listDisallowList = array_merge($this->listBlacklist, $this->listDisallowList);
+		}
 	}
 
 	/**

From 7df1eccbaeddd556b110cc1243103e7813a1e8c8 Mon Sep 17 00:00:00 2001
From: bembelimen <benjamin.trenkle@wicked-chick.de>
Date: Fri, 19 Jun 2020 00:27:45 +0200
Subject: [PATCH 3/4] Fix CS

---
 .../components/com_config/src/Field/FiltersField.php     | 9 ++++++---
 libraries/src/Component/ComponentHelper.php              | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index 9370d2393d2f7..ab77600ea26ee 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -141,13 +141,16 @@ protected function getInput()
 				. ' data-id="' . ($group->value) . '" '
 				. ' class="novalidate custom-select"'
 				. '>';
-				// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+
+			// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
 			$html[] = '					<option value="DL"' . (in_array($group_filter['filter_type'], ['BL', 'DL']) ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_ALLOW_LIST') . '</option>';
-				// "CBL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+
+			// "CBL" is deprecated in Joomla! 4, will be removed in Joomla! 5
 			$html[] = '					<option value="CDL"' . (in_array($group_filter['filter_type'], ['CBL', 'CDL']) ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_DISALLOW_LIST') . '</option>';
-				// "WL" is deprecated in Joomla! 4, will be removed in Joomla! 5
+
+			// "WL" is deprecated in Joomla! 4, will be removed in Joomla! 5
 			$html[] = '					<option value="AL"' . (in_array($group_filter['filter_type'], ['WL', 'AL']) ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_ALLOW_LIST') . '</option>';
 			$html[] = '					<option value="NH"' . ($group_filter['filter_type'] == 'NH' ? ' selected="selected"' : '') . '>'
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index ecf2de0014fac..68d1e48f35ab8 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/libraries/src/Component/ComponentHelper.php
@@ -201,6 +201,7 @@ public static function filterText($text)
 
 				// Collect the disallowList or allowlist tags and attributes.
 				// Each list is cumulative.
+
 				// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
 				if (in_array($filterType, ['BL', 'DL']))
 				{

From 383b805a710ec3bede6506bb56bca5da56411daf Mon Sep 17 00:00:00 2001
From: bembelimen <benjamin.trenkle@wicked-chick.de>
Date: Fri, 19 Jun 2020 13:13:08 +0200
Subject: [PATCH 4/4] CS

---
 .../components/com_config/src/Field/FiltersField.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index ab77600ea26ee..80fcbc61d3139 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -143,15 +143,15 @@ protected function getInput()
 				. '>';
 
 			// "BL" is deprecated in Joomla! 4, will be removed in Joomla! 5
-			$html[] = '					<option value="DL"' . (in_array($group_filter['filter_type'], ['BL', 'DL']) ? ' selected="selected"' : '') . '>'
+			$html[] = '<option value="DL"' . (in_array($group_filter['filter_type'], ['BL', 'DL']) ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_ALLOW_LIST') . '</option>';
 
 			// "CBL" is deprecated in Joomla! 4, will be removed in Joomla! 5
-			$html[] = '					<option value="CDL"' . (in_array($group_filter['filter_type'], ['CBL', 'CDL']) ? ' selected="selected"' : '') . '>'
+			$html[] = '<option value="CDL"' . (in_array($group_filter['filter_type'], ['CBL', 'CDL']) ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_DISALLOW_LIST') . '</option>';
 
 			// "WL" is deprecated in Joomla! 4, will be removed in Joomla! 5
-			$html[] = '					<option value="AL"' . (in_array($group_filter['filter_type'], ['WL', 'AL']) ? ' selected="selected"' : '') . '>'
+			$html[] = '<option value="AL"' . (in_array($group_filter['filter_type'], ['WL', 'AL']) ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_ALLOW_LIST') . '</option>';
 			$html[] = '					<option value="NH"' . ($group_filter['filter_type'] == 'NH' ? ' selected="selected"' : '') . '>'
 				. Text::_('COM_CONFIG_FIELD_FILTERS_NO_HTML') . '</option>';