Merge branch '4.2-dev' into 4.2/upmerges/2022-03-29

.drone.yml

@@ -57,13 +57,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
-#  - name: php81-unit
-#    depends_on: [ phpcs ]
-#    image: joomlaprojects/docker-images:php8.1
-#    failure: ignore
-#    commands:
-#      - php -v
-#      - ./libraries/vendor/bin/phpunit --testsuite Unit
+  - name: php81-unit
+    depends_on: [ phpcs ]
+    image: joomlaprojects/docker-images:php8.1
+    failure: ignore
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php72-integration
     depends_on: [ npm ]
@@ -415,11 +415,11 @@ steps:
         path: /reference
     when:
       branch:
-        - 4.1-dev
+        - 4.2-dev
 
 
 ---
 kind: signature
-hmac: a6f3f2ed21261b612d052724e5f43a5dd55168f98cbaa48eeaa358816bb255df
+hmac: d9707d261edba35bc6b70f09a1babee119cb0a88cebda40171248e5c0a8b135e
 
 ...

README.md

@@ -11,8 +11,8 @@ Overview
 ---------------------
 * This is the source of Joomla! 4.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 4.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.1-dev).
+* Joomla! 4.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.2-dev).
 
 What is Joomla?
 ---------------------
@@ -45,9 +45,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 4.1-dev branch:
+- Go to the 4.2-dev branch:
 ```bash
-git checkout 4.1-dev
+git checkout 4.2-dev
 ```
 - Install all the needed composer packages:
 ```bash

README.txt

@@ -3,8 +3,8 @@ Joomla! CMS™
 1- Overview
 	* This is a Joomla! 4.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 4.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.1-dev
+	* Joomla! 4.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.2-dev
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.

administrator/components/com_actionlogs/tmpl/actionlogs/default.php

@@ -24,6 +24,7 @@
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('keepalive')
+	->useScript('table.columns')
 	->useScript('multiselect')
 	->useScript('com_actionlogs.admin-actionlogs');
 

administrator/components/com_admin/script.php

@@ -7716,6 +7716,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/libraries/vendor/tobscure/json-api/.git/hooks',
 			'/libraries/vendor/tobscure/json-api/.git/branches',
 			'/libraries/vendor/tobscure/json-api/.git',
+			// From 4.1.1 to 4.2.0
+			'/libraries/src/Service/Provider/ApiRouter.php'
 		);
 
 		$status['files_checked'] = $files;

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql

@@ -1,7 +1,13 @@
+-- The following statement was moved from below to here and modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__extensions` DROP COLUMN `system_data` /** CAN FAIL **/;
+
 -- From 4.0.0-2016-07-03.sql
-INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-('plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-('plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+-- The following statement was modified for 4.1.1 by removing the `system_data` column.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+('plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', 0, '0000-00-00 00:00:00', 0, 0),
+('plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 -- From 4.0.0-2016-09-22.sql
 DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'phputf8';
@@ -10,17 +16,22 @@ DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'phputf8';
 DELETE FROM `#__extensions` WHERE `type` = 'plugin' AND `element` = 'p3p' AND `folder` = 'system';
 
 -- From 4.0.0-2016-10-02.sql
-ALTER TABLE `#__user_keys` DROP COLUMN `invalid`;
+-- The following statement was modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__user_keys` DROP COLUMN `invalid` /** CAN FAIL **/;
 
 --
 -- Insert the new templates into the database. Set as home if the old template is the active one
 --
-INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-('atum', 'template', 'atum', '', 1, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+-- The following statement was modified for 4.1.1 by removing the `system_data` column.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+('atum', 'template', 'atum', '', 1, 1, 1, 0, '{}', '{}', '', 0, '0000-00-00 00:00:00', 0, 0),
+('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 -- The following statement had to be modified for 4.1 by adding the `inheritable` and `parent` columns.
--- See https://github.com/joomla/joomla-cms/pull/36585 .
+-- See https://github.com/joomla/joomla-cms/pull/36585
 INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `inheritable`, `parent`, `params`) VALUES
 ('atum', 1, (CASE WHEN (SELECT b.`count` FROM (SELECT count(a.`id`) AS `count` FROM `#__template_styles` a WHERE a.`home` = '1' AND a.`client_id` = 1 AND a.`template` IN ('isis', 'hathor')) AS b) = 0 THEN '0' ELSE '1' END), 'atum - Default', 1, '', '{}'),
 ('cassiopeia', 0, (CASE WHEN (SELECT d.`count` FROM (SELECT count(c.`id`) AS `count` FROM `#__template_styles` c WHERE c.`home` = '1' AND c.`client_id` = 0 AND c.`template` IN ('protostar', 'beez3')) AS d) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', 1, '', '{}');
@@ -49,7 +60,9 @@ DELETE FROM `#__template_styles` WHERE `template` = 'beez3' AND `client_id` = 0;
 DELETE FROM `#__extensions` WHERE `name` = 'mod_submenu';
 
 -- From 4.0.0-2017-03-18.sql
-ALTER TABLE `#__extensions` DROP COLUMN `system_data`;
+-- The following statement was moved to the top for 4.1.1.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+-- ALTER TABLE `#__extensions` DROP COLUMN `system_data`;
 
 -- From 4.0.0-2017-04-25.sql
 INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
@@ -63,8 +76,10 @@ UPDATE `#__menu` SET `link` = 'index.php?option=com_config&view=config' WHERE `l
 UPDATE `#__menu` SET `link` = 'index.php?option=com_config&view=templates' WHERE `link` = 'index.php?option=com_config&view=templates&controller=config.display.templates';
 
 -- From 4.0.0-2017-06-03.sql
-ALTER TABLE `#__extensions` ADD COLUMN `changelogurl` text AFTER `element`;
-ALTER TABLE `#__updates` ADD COLUMN `changelogurl` text AFTER `infourl`;
+-- The following two statements were modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__extensions` ADD COLUMN `changelogurl` text AFTER `element` /** CAN FAIL **/;
+ALTER TABLE `#__updates` ADD COLUMN `changelogurl` text AFTER `infourl` /** CAN FAIL **/;
 
 -- From 4.0.0-2017-10-10.sql
 INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql

@@ -33,7 +33,9 @@ CREATE TABLE IF NOT EXISTS `#__workflows` (
 -- Dumping data for table `#__workflows`
 --
 
-INSERT INTO `#__workflows` (`id`, `asset_id`, `published`, `title`, `description`, `extension`, `default`, `ordering`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`) VALUES
+-- The following statement was modified for 4.1.1 by adding the "IGNORE" keyword.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+INSERT IGNORE INTO `#__workflows` (`id`, `asset_id`, `published`, `title`, `description`, `extension`, `default`, `ordering`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`) VALUES
 (1, 0, 1, 'COM_WORKFLOW_BASIC_WORKFLOW', '', 'com_content.article', 1, 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, 0);
 
 --
@@ -78,7 +80,9 @@ CREATE TABLE IF NOT EXISTS `#__workflow_stages` (
 -- Dumping data for table `#__workflow_stages`
 --
 
-INSERT INTO `#__workflow_stages` (`id`, `asset_id`, `ordering`, `workflow_id`, `published`, `title`, `description`, `default`, `checked_out_time`, `checked_out`) VALUES
+-- The following statement was modified for 4.1.1 by adding the "IGNORE" keyword.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+INSERT IGNORE INTO `#__workflow_stages` (`id`, `asset_id`, `ordering`, `workflow_id`, `published`, `title`, `description`, `default`, `checked_out_time`, `checked_out`) VALUES
 (1, 0, 1, 1, 1, 'COM_WORKFLOW_BASIC_STAGE', '', 1, NULL, 0);
 
 --
@@ -111,7 +115,9 @@ CREATE TABLE IF NOT EXISTS `#__workflow_transitions` (
 -- Dumping data for table `#__workflow_transitions`
 --
 
-INSERT INTO `#__workflow_transitions` (`id`, `asset_id`, `published`, `ordering`, `workflow_id`, `title`, `description`, `from_stage_id`, `to_stage_id`, `options`, `checked_out_time`, `checked_out`) VALUES
+-- The following statement was modified for 4.1.1 by adding the "IGNORE" keyword.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+INSERT IGNORE INTO `#__workflow_transitions` (`id`, `asset_id`, `published`, `ordering`, `workflow_id`, `title`, `description`, `from_stage_id`, `to_stage_id`, `options`, `checked_out_time`, `checked_out`) VALUES
 (1, 0, 1, 1, 1, 'Unpublish', '', -1, 1, '{"publishing":"0"}', NULL, 0),
 (2, 0, 1, 2, 1, 'Publish', '', -1, 1, '{"publishing":"1"}', NULL, 0),
 (3, 0, 1, 3, 1, 'Trash', '', -1, 1, '{"publishing":"-2"}', NULL, 0),
@@ -137,5 +143,8 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 --
 -- Creating Associations for existing content
 --
-INSERT INTO `#__workflow_associations` (`item_id`, `stage_id`, `extension`)
+
+-- The following statement was modified for 4.1.1 by adding the "IGNORE" keyword.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+INSERT IGNORE INTO `#__workflow_associations` (`item_id`, `stage_id`, `extension`)
 SELECT `id`, 1, 'com_content.article' FROM `#__content`;

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql

@@ -20,11 +20,15 @@ ALTER TABLE `#__finder_links` MODIFY `publish_start_date` datetime NULL DEFAULT
 ALTER TABLE `#__finder_links` MODIFY `publish_end_date` datetime NULL DEFAULT NULL;
 ALTER TABLE `#__finder_links` MODIFY `start_date` datetime NULL DEFAULT NULL;
 ALTER TABLE `#__finder_links` MODIFY `end_date` datetime NULL DEFAULT NULL;
-ALTER TABLE `#__finder_links` ADD INDEX `idx_language` (`language`);
+-- The following statement was modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__finder_links` ADD INDEX `idx_language` (`language`) /** CAN FAIL **/;
 ALTER TABLE `#__finder_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__finder_links` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-CREATE TABLE `#__finder_links_terms` (
+-- The following statement was modified for 4.1.1 by adding the "IF NOT EXISTS" keywords.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms` (
 	`link_id` INT UNSIGNED NOT NULL,
 	`term_id` INT UNSIGNED NOT NULL,
 	`weight` FLOAT UNSIGNED NOT NULL DEFAULT 0,
@@ -33,22 +37,24 @@ CREATE TABLE `#__finder_links_terms` (
 	INDEX `idx_link_term_weight` (`link_id`, `term_id`, `weight`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
-DROP TABLE `#__finder_links_terms0`;
-DROP TABLE `#__finder_links_terms1`;
-DROP TABLE `#__finder_links_terms2`;
-DROP TABLE `#__finder_links_terms3`;
-DROP TABLE `#__finder_links_terms4`;
-DROP TABLE `#__finder_links_terms5`;
-DROP TABLE `#__finder_links_terms6`;
-DROP TABLE `#__finder_links_terms7`;
-DROP TABLE `#__finder_links_terms8`;
-DROP TABLE `#__finder_links_terms9`;
-DROP TABLE `#__finder_links_termsa`;
-DROP TABLE `#__finder_links_termsb`;
-DROP TABLE `#__finder_links_termsc`;
-DROP TABLE `#__finder_links_termsd`;
-DROP TABLE `#__finder_links_termse`;
-DROP TABLE `#__finder_links_termsf`;
+-- The following 16 statements were modified for 4.1.1 by adding the "IF EXISTS" keywords.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+DROP TABLE IF EXISTS `#__finder_links_terms0`;
+DROP TABLE IF EXISTS `#__finder_links_terms1`;
+DROP TABLE IF EXISTS `#__finder_links_terms2`;
+DROP TABLE IF EXISTS `#__finder_links_terms3`;
+DROP TABLE IF EXISTS `#__finder_links_terms4`;
+DROP TABLE IF EXISTS `#__finder_links_terms5`;
+DROP TABLE IF EXISTS `#__finder_links_terms6`;
+DROP TABLE IF EXISTS `#__finder_links_terms7`;
+DROP TABLE IF EXISTS `#__finder_links_terms8`;
+DROP TABLE IF EXISTS `#__finder_links_terms9`;
+DROP TABLE IF EXISTS `#__finder_links_termsa`;
+DROP TABLE IF EXISTS `#__finder_links_termsb`;
+DROP TABLE IF EXISTS `#__finder_links_termsc`;
+DROP TABLE IF EXISTS `#__finder_links_termsd`;
+DROP TABLE IF EXISTS `#__finder_links_termse`;
+DROP TABLE IF EXISTS `#__finder_links_termsf`;
 
 CREATE TABLE IF NOT EXISTS `#__finder_logging` (
   `searchterm` VARCHAR(255) NOT NULL DEFAULT '',
@@ -62,7 +68,9 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
 ALTER TABLE `#__finder_logging` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__finder_logging` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-DROP TABLE `#__finder_taxonomy`;
+-- The following statement was modified for 4.1.1 by adding the "IF EXISTS" keywords.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+DROP TABLE IF EXISTS `#__finder_taxonomy`;
 CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
 	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
 	`parent_id` INT UNSIGNED NOT NULL DEFAULT '0',
@@ -97,14 +105,18 @@ ALTER TABLE `#__finder_terms` CHANGE `language` `language` CHAR(7) NOT NULL DEFA
 ALTER TABLE `#__finder_terms` MODIFY `term` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
 ALTER TABLE `#__finder_terms` MODIFY `stem` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
 ALTER TABLE `#__finder_terms` MODIFY `soundex` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
-ALTER TABLE `#__finder_terms` DROP INDEX `idx_term`;
-ALTER TABLE `#__finder_terms` ADD INDEX `idx_stem` (`stem`);
-ALTER TABLE `#__finder_terms` ADD INDEX `idx_language` (`language`);
-ALTER TABLE `#__finder_terms` ADD UNIQUE INDEX `idx_term_language` (`term`, `language`);
+-- The following 4 statements were modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__finder_terms` DROP INDEX `idx_term` /** CAN FAIL **/;
+ALTER TABLE `#__finder_terms` ADD INDEX `idx_stem` (`stem`) /** CAN FAIL **/;
+ALTER TABLE `#__finder_terms` ADD INDEX `idx_language` (`language`) /** CAN FAIL **/;
+ALTER TABLE `#__finder_terms` ADD UNIQUE INDEX `idx_term_language` (`term`, `language`) /** CAN FAIL **/;
 ALTER TABLE `#__finder_terms` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `#__finder_terms_common`;
-CREATE TABLE `#__finder_terms_common` (
+-- The following statement was modified for 4.1.1 by adding the "IF NOT EXISTS" keywords.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+CREATE TABLE IF NOT EXISTS `#__finder_terms_common` (
   `term` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `language` char(7) NOT NULL DEFAULT '',
   `custom` int NOT NULL DEFAULT '0',
@@ -292,13 +304,17 @@ ALTER TABLE `#__finder_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_
 ALTER TABLE `#__finder_tokens` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `context`;
 ALTER TABLE `#__finder_tokens` MODIFY `term` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
 ALTER TABLE `#__finder_tokens` MODIFY `stem` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
-ALTER TABLE `#__finder_tokens` ADD INDEX `idx_stem` (`stem`);
-ALTER TABLE `#__finder_tokens` ADD INDEX `idx_language` (`language`);
+-- The following 2 statements were modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__finder_tokens` ADD INDEX `idx_stem` (`stem`) /** CAN FAIL **/;
+ALTER TABLE `#__finder_tokens` ADD INDEX `idx_language` (`language`) /** CAN FAIL **/;
 ALTER TABLE `#__finder_tokens` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 TRUNCATE TABLE `#__finder_tokens_aggregate`;
 ALTER TABLE `#__finder_tokens_aggregate` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-ALTER TABLE `#__finder_tokens_aggregate` DROP COLUMN `map_suffix`;
+-- The following statement was modified for 4.1.1 by adding the "/** CAN FAIL **/" installer hint.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+ALTER TABLE `#__finder_tokens_aggregate` DROP COLUMN `map_suffix` /** CAN FAIL **/;
 ALTER TABLE `#__finder_tokens_aggregate` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `total_weight`;
 ALTER TABLE `#__finder_tokens_aggregate` MODIFY `term` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
 ALTER TABLE `#__finder_tokens_aggregate` MODIFY `stem` varchar(75) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';

administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-29.sql

@@ -6,7 +6,9 @@ ALTER TABLE `#__ucm_content` MODIFY `core_publish_up` datetime NULL DEFAULT NULL
 ALTER TABLE `#__ucm_content` MODIFY `core_publish_down` datetime NULL DEFAULT NULL;
 
 -- Only on MySQL: Update empty strings to null date before converting the column from varchar to datetime
-UPDATE `#__ucm_content` SET `core_checked_out_time` = '0000-00-00 00:00:00' WHERE `core_checked_out_time` = '';
+-- The following statement was modified for 4.1.1 by adding a check for NULL and a type cast to CHAR.
+-- See https://github.com/joomla/joomla-cms/pull/37156
+UPDATE `#__ucm_content` SET `core_checked_out_time` = '0000-00-00 00:00:00' WHERE `core_checked_out_time` IS NOT NULL AND CAST(`core_checked_out_time` AS char) = '';
 
 ALTER TABLE `#__ucm_content` MODIFY `core_checked_out_time` datetime NULL DEFAULT NULL;