--- replace-drupal-container-with-drupal-service-2014017-45.patch	2013-08-08 21:41:52.000000000 +0200
+++ replace-drupal-container-with-drupal-service-2014017-49.patch	2013-08-15 19:44:05.687282371 +0200
@@ -11,21 +11,8 @@
   * // Use this to transliterate some text.
   * $transformed = $trans->transliterate($string, $langcode);
   * @endcode
-diff --git a/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php b/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
-index 077ee5b..d55ba0f 100644
---- a/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
-+++ b/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
-@@ -27,7 +27,7 @@ public function form($form, &$form_state) {
-       $manager = new $plugin_definition['manager']();
-     }
-     else {
--      $manager = drupal_container()->get($plugin_definition['manager']);
-+      $manager = \Drupal::service($plugin_definition['manager']);
-     }
-     $plugins = $manager->getDefinitions();
- 
 diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
-index 6a782ed..103f7d6 100644
+index 3454c1e..702c517 100644
 --- a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
 +++ b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
 @@ -112,7 +112,7 @@ protected function assertUrlOutboundAlter($original, $final) {
@@ -47,7 +34,7 @@
    }
  }
 diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php
-index a764dc9..0affc3f 100644
+index e7bc98c..958128c 100644
 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php
 +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php
 @@ -39,13 +39,13 @@ function testTwigAutoReloadOverride() {
@@ -109,7 +96,7 @@
    }
  
 diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
-index e7fa8e0..d21b958 100644
+index 65981f1..fe129ac 100644
 --- a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
 +++ b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
 @@ -63,7 +63,7 @@ function testUpdateAccess() {
@@ -122,18 +109,10 @@
      $this->drupalLogin($user1);
      $this->drupalGet($this->update_url, array('external' => TRUE));
 diff --git a/core/modules/system/system.module b/core/modules/system/system.module
-index 1935f5c..830cce4 100644
+index 6a8478f..c3924d5 100644
 --- a/core/modules/system/system.module
 +++ b/core/modules/system/system.module
-@@ -963,7 +963,6 @@ function system_menu() {
-       'route_name' => 'date_format_localize_reset',
-     );
-   }
--
-   return $items;
- }
- 
-@@ -2256,7 +2255,7 @@ function system_page_build(&$page) {
+@@ -2239,7 +2239,7 @@ function system_page_build(&$page) {
   */
  function system_custom_theme() {
    if (drupal_container()->isScopeActive('request')) {
@@ -141,9 +120,9 @@
 +    $request = Drupal::request();
      $path = $request->attributes->get('_system_path');
      if (user_access('view the administration theme') && path_is_admin($path)) {
-       return config('system.theme')->get('admin');
+       return Drupal::config('system.theme')->get('admin');
 diff --git a/core/modules/system/tests/modules/design_test/design_test.module b/core/modules/system/tests/modules/design_test/design_test.module
-index f69f961..35b8a73 100644
+index 334ea31..cd4dc2e 100644
 --- a/core/modules/system/tests/modules/design_test/design_test.module
 +++ b/core/modules/system/tests/modules/design_test/design_test.module
 @@ -95,7 +95,7 @@ function design_test_menu_local_tasks_alter(&$data, $router_item, $root_path) {
@@ -152,7 +131,7 @@
      // Determine the currently selected theme, if any.
 -    $selected_theme = drupal_container()->get('request')->query->get('theme');
 +    $selected_theme = Drupal::request()->query->get('theme');
-     $default_theme = config('system.theme')->get('default');
+     $default_theme = Drupal::config('system.theme')->get('default');
  
      // Expand all enabled themes into action links.
 @@ -129,5 +129,5 @@ function design_test_menu_local_tasks_alter(&$data, $router_item, $root_path) {