Unverified Commit 4e4f76c9 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2940121 by apaderno, andypost, idebr, Kingdutch, kala4ek, mfb,... 

Issue #2940121 by apaderno, andypost, idebr, Kingdutch, kala4ek, mfb, alexpott, Berdir: ConfigurableLanguageManager::getLanguageSwitchLinks() doesn't respect what LanguageManagerInterface::getLanguageSwitchLinks() says to return

(cherry picked from commit c45aba90)
parent 8417e5ff

core/lib/Drupal/Core/Language/LanguageManager.php

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public function getFallbackCandidates(array $context = []) { 
   * {@inheritdoc}

   */

  public function getLanguageSwitchLinks($type, Url $url) {

    return [];

    return NULL;

  }



  /**

core/lib/Drupal/Core/Language/LanguageManagerInterface.php

+5 −2
Original line number Diff line number Diff line
@@ -171,8 +171,11 @@ public function getFallbackCandidates(array $context = []); 
   * @param \Drupal\Core\Url $url

   *   The URL the switch links will be relative to.

   *

   * @return array

   *   A keyed array of links ready to be themed.

   * @return object|null

   *   An object with the following keys:

   *   - links: An array of links indexed by the language ID

   *   - method_id: The language negotiation method ID

   *   or NULL if there are no language switch links.

   */

  public function getLanguageSwitchLinks($type, Url $url);

core/modules/language/src/ConfigurableLanguageManager.php

+1 −3
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ public function getFallbackCandidates(array $context = []) { 
   * {@inheritdoc}

   */

  public function getLanguageSwitchLinks($type, Url $url) {

    $links = FALSE;



    if ($this->negotiator) {

      foreach ($this->negotiator->getNegotiationMethods($type) as $method_id => $method) {

        $reflector = new \ReflectionClass($method['class']);
@@ -422,7 +420,7 @@ public function getLanguageSwitchLinks($type, Url $url) { 
      }

    }



    return $links;

    return $links ?? NULL;

  }



  /**