Bugfix for ethercreative#469 that was introduced iin 4.2.2

niektenhoopen · Jul 29, 2024 · 839f0ff · 839f0ff
1 parent c96405a
commit 839f0ff
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/models/data/SeoData.php b/src/models/data/SeoData.php
@@ -377,9 +377,14 @@ public function getExpiry ()
 	 */
 	public function getCanonical ()
 	{
-		if (empty($this->advanced['canonical']))
-			return UrlHelper::siteUrl(Craft::$app->request->getFullPath());
-
+        if (empty($this->advanced['canonical'])) {
+            $fullPathWithPagination = Craft::$app->request->getFullPath();
+            $pathInfo = Craft::$app->request->getPathInfo();
+            return ($subPath = strpos($fullPathWithPagination, $pathInfo . '/')) === false ?
+                UrlHelper::siteUrl($pathInfo) :
+                UrlHelper::siteUrl(substr($fullPathWithPagination, $subPath));
+        }
+
 		return UrlHelper::siteUrl($this->advanced['canonical']);
 	}