From 6856f60ff95e4ac3a6c536a93e0aad4935eb6688 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 24 Oct 2023 20:27:16 +0900
Subject: [PATCH] Fix incorrect default canonical URL on pages using Router

---
 classes/display/HTMLDisplayHandler.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 34b558edc..f576c4102 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -525,19 +525,26 @@ class HTMLDisplayHandler
 		{
 			if ($page_type === 'article')
 			{
-				$canonical_url = getFullUrl('', 'mid', $current_module_info->mid, 'document_srl', $document_srl);
+				$canonical_url = getNotEncodedFullUrl('', 'mid', $current_module_info->mid, 'document_srl', $document_srl);
 			}
 			elseif (($page = Context::get('page')) > 1)
 			{
-				$canonical_url = getFullUrl('', 'mid', $current_module_info->mid, 'page', $page);
+				$canonical_url = getNotEncodedFullUrl('', 'mid', $current_module_info->mid, 'page', $page);
 			}
 			elseif (isset($current_module_info->module_srl) && $current_module_info->module_srl == ($site_module_info->module_srl ?? 0))
 			{
-				$canonical_url = getFullUrl('');
+				$canonical_url = getNotEncodedFullUrl('');
 			}
 			else
 			{
-				$canonical_url = getFullUrl('', 'mid', $current_module_info->mid);
+				if (Rhymix\Framework\Router::getRewriteLevel() === 2 && Context::getRouteInfo()->url !== '')
+				{
+					$canonical_url = Rhymix\Framework\URL::getCurrentDomainURL(\RX_BASEURL . preg_replace('/\?.*$/', '', \RX_REQUEST_URL));
+				}
+				else
+				{
+					$canonical_url = getNotEncodedFullUrl('', 'mid', $current_module_info->mid);
+				}
 			}
 			Context::addOpenGraphData('og:url', $canonical_url);
 			Context::setCanonicalURL($canonical_url);