Merge branch 'stable' into fix/order_confirmation_not_changing_lang

plentymarkets · Feb 14, 2024 · 58c3dda · 58c3dda
2 parents 0234a95 + 0615212
commit 58c3dda
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/meta/documents/changelog_de.md b/meta/documents/changelog_de.md
@@ -1,11 +1,17 @@
 # Release Notes für IO
 
-## v5.0.62 (xxxx-xx-xx)
+## v5.0.63 (2024-XX-XX)
 
 ### Fixed
 
 - Es wurde ein Fehler behoben, der dazu führte, dass der Benutzer auf die Homepage umgeleitet wurde, wenn die Sprache auf der Bestellbestätigungsseite geändert wurde.
 
+## v5.0.62 (2024-XX-XX) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.61...5.0.62" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>
+
+### Behoben
+
+- Ein Fehler bei der Prüfung von kanonischen Urls in Kombination mit ausgeschlossenen ShopBooster Parametern, kann zu fehlenden alternate links führen. Dies wurde behoben.
+
 ## v5.0.61 (2023-10-30) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.60...5.0.61" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>
 
 ### Behoben

diff --git a/meta/documents/changelog_en.md b/meta/documents/changelog_en.md
@@ -1,11 +1,17 @@
 # Release Notes for IO
 
-## v5.0.62 (xxxx-xx-xx)
+## v5.0.63 (2024-XX-XX)
 
 ### Fixed
 
 - Solved a bug that manifested by redirecting the user to the homepage when the language was changed on order confirmation page.
 
+## v5.0.62 (2023-XX-XX) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.61...5.0.62" target="_blank" rel="noopener"><b>Overview of all changes</b></a>
+
+### Fixed
+
+- An error when checking canonical urls in combination with excluded ShopBooster parameters can lead to missing alternate links. This was fixed.
+
 ## v5.0.61 (2023-10-30) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.60...5.0.61" target="_blank" rel="noopener"><b>Overview of all changes</b></a>
 
 ### Fixed

diff --git a/src/Services/UrlService.php b/src/Services/UrlService.php
@@ -234,8 +234,19 @@ public function isCanonical($lang = null)
         $request = pluginApp(Request::class);
         $requestUri = $request->getRequestUri();
 
+        $url = explode('?', $requestUri)[0];
+
+        $queryParameters = $request->query();
+        $queryParameters = Utils::cleanUpExcludesContentCacheParams($queryParameters);
+        $queryParameters = http_build_query($queryParameters, null, '&', PHP_QUERY_RFC3986);
+        if (strlen($queryParameters) > 0)
+        {
+            $url .= '?' . $queryParameters;
+        }
+
+
         /** @var UrlQuery $urlQuery */
-        $urlQuery = pluginApp(UrlQuery::class, ['path' => $requestUri]);
+        $urlQuery = pluginApp(UrlQuery::class, ['path' => $url]);
         $requestUrl = $urlQuery->toAbsoluteUrl($lang !== $defaultLanguage);
         $canonical = $this->getCanonicalURL($lang);