From 928a0ab5d9e3c8e480cabc4a3bee33a38d6f523f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 7 May 2024 22:30:12 +0900
Subject: [PATCH] Fix #2345 missing module name in admin page title

---
 modules/admin/controllers/Base.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/admin/controllers/Base.php b/modules/admin/controllers/Base.php
index d963eb215..bef63a2cb 100644
--- a/modules/admin/controllers/Base.php
+++ b/modules/admin/controllers/Base.php
@@ -98,14 +98,13 @@ class Base extends \ModuleObject
 		$result = AdminMenuModel::checkAdminMenu();
 		include $result->php_file;
 
-		$oModuleModel = getModel('module');
-
 		// get current menu's subMenuTitle
-		$moduleActionInfo = $oModuleModel->getModuleActionXml($module);
+		$moduleActionInfo = \ModuleModel::getModuleActionXml($module);
+		$moduleMenus = isset($moduleActionInfo->menu) ? (array)$moduleActionInfo->menu : [];
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
 
-		foreach((array)$moduleActionInfo->menu as $value)
+		foreach($moduleMenus as $value)
 		{
 			if(is_array($value->acts) && in_array($currentAct, $value->acts))
 			{
@@ -113,6 +112,15 @@ class Base extends \ModuleObject
 				break;
 			}
 		}
+		if (!$subMenuTitle && count($moduleMenus))
+		{
+			$subMenuTitle = array_first($moduleMenus)->title;
+		}
+		if (!$subMenuTitle)
+		{
+			$moduleInfo = \ModuleModel::getModuleInfoXml($module);
+			$subMenuTitle = $moduleInfo->title ?? 'Dashboard';
+		}
 
 		// get current menu's srl(=parentSrl)
 		$parentSrl = 0;
@@ -145,7 +153,7 @@ class Base extends \ModuleObject
 		Context::set('gnbUrlList', $menu->list);
 		Context::set('parentSrl', $parentSrl);
 		Context::set('gnb_title_info', $gnbTitleInfo ?? null);
-		Context::addBrowserTitle($subMenuTitle ? $subMenuTitle : 'Dashboard');
+		Context::addBrowserTitle($subMenuTitle);
 	}
 
 	/**