X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fthemes%2Fcontrib%2Fbootstrap%2Fsrc%2FPlugin%2FPreprocess%2FBootstrapDropdown.php;fp=web%2Fthemes%2Fcontrib%2Fbootstrap%2Fsrc%2FPlugin%2FPreprocess%2FBootstrapDropdown.php;h=b6eb9094fb7505d2269943bdc48c78be142196fc;hp=8c0a6de217187346bec136c9df659a0c6ea53942;hb=dd08b95e4e519a02d45a50fb504bf5d685eaa9e3;hpb=0bf8d09d2542548982e81a441b1f16e75873a04f

diff --git a/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php b/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php
index 8c0a6de21..b6eb9094f 100644
--- a/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php
+++ b/web/themes/contrib/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php
@@ -77,10 +77,9 @@ class BootstrapDropdown extends PreprocessBase implements PreprocessInterface {
             $wrapper_attributes['hreflang'] = $element['language']->getId();
 
             // Ensure the Url language is set on the object itself.
-            // @todo Possibly a core bug?
-            if (empty($element['url']->getOption('language'))) {
-              $element['url']->setOption('language', $element['language']);
-            }
+            // @todo Revisit, possibly a core bug?
+            // @see https://www.drupal.org/project/bootstrap/issues/2868100
+            $element['url']->setOption('language', $element['language']);
           }
 
           // Preserve query parameters (if any)