From 912229c88151ff5030239dcf4ca842d06cc80a28 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 25 Jun 2023 17:35:18 +0900 Subject: [PATCH] Allow using reserved word as mid if it is identical to module name --- modules/module/module.controller.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 4f20de21c..b4f8ea5c6 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -497,12 +497,15 @@ class ModuleController extends Module } // Check whether the module name already exists - if(ModuleModel::isIDExists($args->mid)) + $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl); + if($args->mid !== $module_info->mid && ModuleModel::isIDExists($args->mid)) { - return new BaseObject(-1, 'msg_module_name_exists'); + if ($args->module !== $args->mid) + { + return new BaseObject(-1, 'msg_module_name_exists'); + } } - $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl); $args->browser_title = escape(strip_tags($args->browser_title ?? $module_info->browser_title), false); $args->description = isset($args->description) ? escape($args->description, false) : null;