Merge pull request #480 from therealpecus/v4-dev

fix: regression on multisite canonical URLs (v4)
ethercreative · Oct 9, 2024 · fc00aac · fc00aac
2 parents c31a157 + 8149588
commit fc00aac
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/models/data/SeoData.php b/src/models/data/SeoData.php
@@ -377,8 +377,13 @@ 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']);
 	}