Commit 6433cd0a authored by catch's avatar catch
Browse files

Issue #3001430 by alexpott, _utsavsharma, lauriii, Oscaner, catch, smustgrave,... 

Issue #3001430 by alexpott, _utsavsharma, lauriii, Oscaner, catch, smustgrave, ifux, deviantintegral, pameeela: Unable to uninstall base theme and subtheme via config sync at the same time

(cherry picked from commit 6f8aa738)
parent 95a2a252

core/lib/Drupal/Core/Config/ConfigImporter.php

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ public function __construct(StorageComparerInterface $storage_comparer, EventDis 
    $this->themeHandler = $theme_handler;

    $this->stringTranslation = $string_translation;

    if ($extension_list_theme === NULL) {

      @trigger_error('Calling ' . __METHOD__ . ' without the $extension_list_theme argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3284397', E_USER_DEPRECATED);

      $extension_list_theme = \Drupal::service('extension.list.theme');

    }

    $this->themeExtensionList = $extension_list_theme;

core/modules/config/src/Form/ConfigSingleImportForm.php

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Sto 
    $this->themeHandler = $theme_handler;

    $this->moduleExtensionList = $extension_list_module;

    if ($extension_list_theme === NULL) {

      @trigger_error('Calling ' . __METHOD__ . ' without the $extension_list_theme argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3284397', E_USER_DEPRECATED);

      $extension_list_theme = \Drupal::service('extension.list.theme');

    }

    $this->themeExtensionList = $extension_list_theme;