From a6e453ec0a46a8da5a05f66fea15a2ed8e4656dc Mon Sep 17 00:00:00 2001
From: quietone <quietone@2572884.no-reply.drupal.org>
Date: Fri, 2 Aug 2024 16:31:11 +1200
Subject: [PATCH] Issue #3465360 by catch, benjifisher, tobybellwood: drush
updb errors on System and Layout Builder modules when going 10.3.1 to
11.0.0.-rc1
(cherry picked from commit 6b50d024b721b68cedaa8e0151bb46aae737c4af)
---
.../layout_builder/layout_builder.post_update.php | 1 -
core/modules/system/system.post_update.php | 10 +++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/core/modules/layout_builder/layout_builder.post_update.php b/core/modules/layout_builder/layout_builder.post_update.php
index 00a49635b9d7..22c98f15563c 100644
--- a/core/modules/layout_builder/layout_builder.post_update.php
+++ b/core/modules/layout_builder/layout_builder.post_update.php
@@ -29,7 +29,6 @@ function layout_builder_removed_post_updates() {
'layout_builder_post_update_section_storage_context_mapping' => '10.0.0',
'layout_builder_post_update_tempstore_route_enhancer' => '10.0.0',
'layout_builder_post_update_timestamp_formatter' => '11.0.0',
- 'layout_builder_post_update_default_expose_field_block_setting' => '11.0.0',
'layout_builder_post_update_enable_expose_field_block_feature_flag' => '11.0.0',
];
}
diff --git a/core/modules/system/system.post_update.php b/core/modules/system/system.post_update.php
index db6464943ed5..73ebac84e190 100644
--- a/core/modules/system/system.post_update.php
+++ b/core/modules/system/system.post_update.php
@@ -53,7 +53,6 @@ function system_removed_post_updates() {
'system_post_update_amend_config_sync_readme_url' => '11.0.0',
'system_post_update_mail_notification_setting' => '11.0.0',
'system_post_update_set_cron_logging_setting_to_boolean' => '11.0.0',
- 'system_post_update_sdc_uninstall' => '11.0.0',
'system_post_update_move_development_settings_to_keyvalue' => '11.0.0',
'system_post_update_add_langcode_to_all_translatable_config' => '11.0.0',
];
@@ -77,3 +76,12 @@ function system_post_update_convert_empty_country_and_timezone_settings_to_null(
$system_date_settings->save();
}
}
+
+/**
+ * Uninstall the sdc module if installed.
+ */
+function system_post_update_sdc_uninstall() {
+ if (\Drupal::moduleHandler()->moduleExists('sdc')) {
+ \Drupal::service('module_installer')->uninstall(['sdc'], FALSE);
+ }
+}
--
GitLab