Updated all the contrib modules to their latest versions.

[yaffs-website] / web / modules / contrib / redirect / src / RedirectRepository.php

diff --git a/web/modules/contrib/redirect/src/RedirectRepository.php b/web/modules/contrib/redirect/src/RedirectRepository.php
index f8a1cea9a02ce6ff4409e0b7ccc41b1a383391a1..236c927f6349c5724c3b2f5d63e559fbfd872ceb 100644 (file)
--- a/web/modules/contrib/redirect/src/RedirectRepository.php
+++ b/web/modules/contrib/redirect/src/RedirectRepository.php
@@ -112,10 +112,12 @@ class RedirectRepository {
    */
   protected function findByRedirect(Redirect $redirect, $language) {
     $uri = $redirect->getRedirectUrl();
-    $baseUrl = \Drupal::request()->getBaseUrl();
-    $path = ltrim(substr($uri->toString(), strlen($baseUrl)), '/');
+    $base_url = \Drupal::request()->getBaseUrl();
+    $generated_url = $uri->toString(TRUE);
+    $path = ltrim(substr($generated_url->getGeneratedUrl(), strlen($base_url)), '/');
     $query = $uri->getOption('query') ?: [];
-    return $this->findMatchingRedirect($path, $query, $language);
+    $return_value = $this->findMatchingRedirect($path, $query, $language);
+    return $return_value ? $return_value->addCacheableDependency($generated_url) : $return_value;
   }
 
   /**