--- language-oo-1862202-270.patch	2013-12-04 03:33:15.000000000 +0100
+++ language-oo-1862202-272.patch	2013-12-10 00:39:13.233378272 +0100
@@ -1,8 +1,8 @@
 diff --git a/core/core.services.yml b/core/core.services.yml
-index c3e6fee..3925528 100644
+index 557d757..156e14c 100644
 --- a/core/core.services.yml
 +++ b/core/core.services.yml
-@@ -215,9 +215,6 @@ services:
+@@ -218,9 +218,6 @@ services:
    http_kernel:
      class: Drupal\Core\HttpKernel
      arguments: ['@event_dispatcher', '@service_container', '@controller_resolver']
@@ -12,7 +12,7 @@
    string_translator.custom_strings:
      class: Drupal\Core\StringTranslation\Translator\CustomStrings
      arguments: ['@settings']
-@@ -500,7 +497,7 @@ services:
+@@ -503,7 +500,7 @@ services:
      class: Drupal\Core\EventSubscriber\LanguageRequestSubscriber
      tags:
        - { name: event_subscriber }
@@ -22,10 +22,10 @@
      class: Drupal\Core\Controller\ExceptionController
      arguments: ['@content_negotiation']
 diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
-index 2a29937..347b7be 100644
+index 086f025..7b6793b 100644
 --- a/core/includes/bootstrap.inc
 +++ b/core/includes/bootstrap.inc
-@@ -2389,37 +2389,13 @@ function language($type) {
+@@ -2392,37 +2392,13 @@ function language($type) {
  }
  
  /**
@@ -66,7 +66,7 @@
   */
  function language_multilingual() {
    return \Drupal::languageManager()->isMultilingual();
-@@ -2436,67 +2412,12 @@ function language_multilingual() {
+@@ -2439,67 +2415,12 @@ function language_multilingual() {
   * @return array
   *   An associative array of languages, keyed by the language code, ordered by
   *   weight ascending and name ascending.
@@ -138,7 +138,7 @@
  }
  
  /**
-@@ -2508,26 +2429,12 @@ function language_list($flags = Language::STATE_CONFIGURABLE) {
+@@ -2511,26 +2432,12 @@ function language_list($flags = Language::STATE_CONFIGURABLE) {
   *
   * @return array
   *   An array of language objects.
@@ -169,7 +169,7 @@
  }
  
  /**
-@@ -2538,10 +2445,14 @@ function language_default_locked_languages($weight = 0) {
+@@ -2541,10 +2448,14 @@ function language_default_locked_languages($weight = 0) {
   *
   * @return \Drupal\core\Language\Language|null
   *   A fully-populated language object or NULL.
@@ -186,7 +186,7 @@
  }
  
  /**
-@@ -2554,6 +2465,7 @@ function language_load($langcode) {
+@@ -2557,6 +2468,7 @@ function language_load($langcode) {
   *   The printed name of the language.
   */
  function language_name($langcode) {
@@ -194,7 +194,7 @@
    if ($langcode == Language::LANGCODE_NOT_SPECIFIED) {
      return t('None');
    }
-@@ -2575,10 +2487,14 @@ function language_name($langcode) {
+@@ -2578,10 +2490,14 @@ function language_name($langcode) {
   *
   * @return bool
   *   Returns whether the language is locked.
@@ -211,7 +211,7 @@
  }
  
  /**
-@@ -2588,33 +2504,9 @@ function language_is_locked($langcode) {
+@@ -2591,33 +2507,9 @@ function language_is_locked($langcode) {
   *   A language object.
   */
  function language_default() {
@@ -268,7 +268,7 @@
   *
   * Changing the dummy query string appended to CSS and JavaScript files forces
 diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
-index e0653b9..bce862f 100644
+index 407ad78..4184c11 100644
 --- a/core/includes/install.core.inc
 +++ b/core/includes/install.core.inc
 @@ -1,5 +1,6 @@
@@ -309,7 +309,7 @@
  
      // Register the translation services.
      install_register_translation_service($container);
-@@ -1607,9 +1619,6 @@ function install_select_language(&$install_state) {
+@@ -1614,9 +1626,6 @@ function install_select_language(&$install_state) {
   * @ingroup forms
   */
  function install_select_language_form($form, &$form_state, $files = array()) {
@@ -319,7 +319,7 @@
    $standard_languages = LanguageManager::getStandardLanguageList();
    $select_options = array();
    $browser_options = array();
-@@ -1621,22 +1630,19 @@ function install_select_language_form($form, &$form_state, $files = array()) {
+@@ -1628,22 +1637,19 @@ function install_select_language_form($form, &$form_state, $files = array()) {
      // Select lists based on available language files.
      foreach ($files as $langcode => $uri) {
        $select_options[$langcode] = isset($standard_languages[$langcode]) ? $standard_languages[$langcode][1] : $langcode;
@@ -966,7 +966,7 @@
 +
  }
 diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
-index 8d6e28c..536b4ab 100644
+index 0160119..3e48b75 100644
 --- a/core/lib/Drupal/Core/DrupalKernel.php
 +++ b/core/lib/Drupal/Core/DrupalKernel.php
 @@ -520,6 +520,8 @@ protected function buildContainer() {
@@ -3839,7 +3839,7 @@
            // although it is required for selected negotiation type.
            form_error($form['domain'][$langcode], $form_state, t('The domain may only be left blank for the default language.'));
 diff --git a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php b/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
-index aa3cc2b..dec3e47 100644
+index d212c7b..5d4bf64 100644
 --- a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
 +++ b/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
 @@ -8,12 +8,11 @@
@@ -3857,7 +3857,7 @@
  use Symfony\Component\HttpFoundation\Request;
  
  /**
-@@ -38,129 +37,98 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
+@@ -38,129 +37,99 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
    /**
     * Language manager for retrieving the url language type.
     *
@@ -3983,7 +3983,7 @@
 -    elseif ($url_source == 'domain') {
 -      $domains = $this->config->get('language.negotiation')->get('url.domains');
 -      if (is_object($options['language']) && !empty($domains[$options['language']->id])) {
--
+ 
 -        // Save the original base URL. If it contains a port, we need to
 -        // retain it below.
 -        if (!empty($options['base_url'])) {
@@ -3998,7 +3998,7 @@
 -        // In case either the original base URL or the HTTP host contains a
 -        // port, retain it.
 -        if (isset($normalized_base_url) && strpos($normalized_base_url, ':') !== FALSE) {
--          list($host, $port) = explode(':', $normalized_base_url);
+-          list( , $port) = explode(':', $normalized_base_url);
 -          $options['base_url'] .= ':' . $port;
 -        }
 -        elseif ($port != 80) {
@@ -5499,7 +5499,7 @@
      $this->installSchema('entity_test', array(
        'entity_test_mul',
 diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
-index bf60ba5..a97d1d4 100644
+index b841235..94f88a9 100644
 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
 +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
 @@ -446,7 +446,7 @@ function testEntityTranslationAPI() {