From 78ba527c784067a18b2999b270b769e85f8c429d Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 20 Jul 2023 21:38:16 +0900
Subject: [PATCH] Fix warnings in PHP 8.x

---
 classes/context/Context.class.php      | 2 +-
 classes/display/HTMLDisplayHandler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index b5bed2667..c2515b260 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -921,7 +921,7 @@ class Context
 			{
 				return $matches[1];
 			}
-		}, $string);
+		}, strval($string));
 	}
 
 	/**
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 970928c46..a713d964d 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -494,7 +494,7 @@ class HTMLDisplayHandler
 			{
 				$canonical_url = getFullUrl('', 'mid', $current_module_info->mid, 'page', $page);
 			}
-			elseif ($current_module_info->module_srl == $site_module_info->module_srl)
+			elseif (isset($current_module_info->module_srl) && $current_module_info->module_srl == ($site_module_info->module_srl ?? 0))
 			{
 				$canonical_url = getFullUrl('');
 			}