diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php index 659f39d..44811c5 100644 --- a/core/lib/Drupal/Core/Language/LanguageManager.php +++ b/core/lib/Drupal/Core/Language/LanguageManager.php @@ -27,13 +27,6 @@ class LanguageManager implements LanguageManagerInterface { protected $translation; /** - * An array of all the available languages keyed by language code. - * - * @var \Drupal\Core\Language\LanguageInterface[] - */ - protected $languages; - - /** * The default language object. * * @var \Drupal\Core\Language\LanguageDefault @@ -130,19 +123,17 @@ public function getDefaultLanguage() { * {@inheritdoc} */ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) { - // Initialize master language list. - if (!isset($this->languages)) { - // No language module, so use the default language only. - $default = $this->getDefaultLanguage(); - $this->languages = array($default->getId() => $default); - // Add the special languages, they will be filtered later if needed. - $this->languages += $this->getDefaultLockedLanguages($default->getWeight()); - } + + // No language module, so use the default language only. + $default = $this->getDefaultLanguage(); + $languages = array($default->getId() => $default); + // Add the special languages, they will be filtered later if needed. + $languages += $this->getDefaultLockedLanguages($default->getWeight()); // Filter the full list of languages based on the value of the $all flag. By // default we remove the locked languages, but the caller may request for // those languages to be added as well. - return $this->languageFilter($this->languages, $flags); + return $this->languageFilter($languages, $flags); } /** diff --git a/core/modules/language/src/ConfigurableLanguageManager.php b/core/modules/language/src/ConfigurableLanguageManager.php index e40bd4c..4d1dec2 100644 --- a/core/modules/language/src/ConfigurableLanguageManager.php +++ b/core/modules/language/src/ConfigurableLanguageManager.php @@ -247,7 +247,6 @@ public function reset($type = NULL) { $this->negotiatedMethods = array(); $this->languageTypes = NULL; $this->languageTypesInfo = NULL; - $this->languages = NULL; if ($this->negotiator) { $this->negotiator->reset(); }