diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 4dc690a..b26105f 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -742,8 +742,7 @@ function language_negotiation_include() { function language_modules_enabled($modules) { include_once DRUPAL_ROOT . '/core/includes/language.inc'; // Load configurability options from configuration. - $configurable = config('system.language.types')->get('configurable'); - language_types_set($configurable); + language_types_set(array()); language_negotiation_purge(); } diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php index a07d8a0..6ab71ba 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php @@ -99,7 +99,7 @@ function testInfoAlterations() { foreach (language_types_get_all() as $type) { $langcode = $last[$type]; $value = $type == Language::TYPE_CONTENT || strpos($type, 'test') !== FALSE ? 'it' : 'en'; - $this->assertEqual($langcode, $value, format_string('The negotiated language for %type is %language', array('%type' => $type, '%language' => $langcode))); + $this->assertEqual($langcode, $value, format_string('The negotiated language for %type is %language', array('%type' => $type, '%language' => $value))); } // Disable language_test and check that everything is set back to the