diff --git a/core/modules/config/config.admin.inc b/core/modules/config/config.admin.inc index a961286..730d3c7 100644 --- a/core/modules/config/config.admin.inc +++ b/core/modules/config/config.admin.inc @@ -113,8 +113,8 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa */ function config_admin_import_form($form, &$form_state) { // Retrieve a list of differences between last known state and active store. - $source_storage = drupal_container()->get('config.storage.staging'); - $target_storage = drupal_container()->get('config.storage'); + $target_storage = Drupal::service('config.storage.staging'); + $target_storage = Drupal::service('config.storage'); $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php b/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php index cee642e..b09867c 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php @@ -110,7 +110,8 @@ function testConfigLocaleUserOverride() { 'preferred_langcode' => 'de', )); - $config_factory = drupal_container()->get('config.factory'); + $config_factory = \Drupal::service('config.factory'); + $config_factory->enterContext($user_config_context->setAccount($account)); // Should not have to re-initialize the configuration object to get new // overrides as the new context will have a different uuid.