merge in internal/improve-email-test-debugging

composer.json

@@ -43,6 +43,7 @@
                 "Ajax not working when using non-default view mode": "https://www.drupal.org/files/issues/2023-01-30/ajax_comments-ajax_non_default_view_mode-2896916-beta5-60.patch"
             },
             "drupal/core": {
+                "Issue #3231503 landed in 10.1.x: Cache the result of hook_entity_extra_field_info()": "https://www.drupal.org/files/issues/2023-08-28/3383704-backport-cache-fix-EntityFieldManager-getextrafields.patch",
                 "Restrict images to this site blocks image style derivatives": "https://www.drupal.org/files/issues/2019-05-10/2528214-54.patch",
                 "Optimize getCommentedEntity()": "https://www.drupal.org/files/issues/2018-12-28/2580551-72.patch",
                 "Multiple usages of FieldPluginBase::getEntity do not check for NULL, leading to WSOD": "https://www.drupal.org/files/issues/2023-01-05/3007424-146-9.5.x.patch",

modules/social_features/social_search/social_search.install

@@ -307,7 +307,6 @@ function social_search_update_11403() : void {
   $views = [
     "views.view.search_all",
     "views.view.search_content",
-    "views.view.search_group",
   ];
 
   foreach ($views as $view) {
@@ -323,3 +322,33 @@ function social_search_update_11403() : void {
     $config->save(TRUE);
   }
 }
+
+/**
+ * Revert search_api_language filter name/id change for groups view.
+ */
+function social_search_update_11404() : void {
+  // There was a typo in the view name of social_search_update_11403 which
+  // caused the groups view not to be updated, so we must do it again here.
+  $views = [
+    "views.view.search_groups",
+  ];
+
+  foreach ($views as $view) {
+    $config = \Drupal::configFactory()->getEditable($view);
+    $display = $config->get("display");
+
+    $filter = $display['default']['display_options']['filters']['language_with_fallback'];
+    $filter['id'] = "search_api_language";
+    $display['default']['display_options']['filters']["search_api_language"] = $filter;
+    unset($display['default']['display_options']['filters']['language_with_fallback']);
+
+    $config->set('display', $display);
+    $config->save(TRUE);
+  }
+
+  // Clean up the config created in our erroneous version of 11403.
+  $incorrect_view = \Drupal::configFactory()->getEditable("views.view.search_group");
+  if (!$incorrect_view->isNew()) {
+    $incorrect_view->delete();
+  }
+}