From 566c1f54b742a2bda4c9ce6964ad77a1e177b035 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 25 Jun 2023 23:43:07 +0900 Subject: [PATCH] Fix isIDExists() error when installing member module for the first time --- modules/module/module.controller.php | 2 +- modules/module/module.model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index b4f8ea5c6..cab5096cc 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -383,7 +383,7 @@ class ModuleController extends Module } // Check whether the module name already exists - if(ModuleModel::isIDExists($args->mid)) + if(ModuleModel::isIDExists($args->mid, $args->module)) { return new BaseObject(-1, 'msg_module_name_exists'); } diff --git a/modules/module/module.model.php b/modules/module/module.model.php index b7fc1f499..d71d7f8c6 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -23,13 +23,13 @@ class ModuleModel extends Module /** * @brief Check if mid is available */ - public static function isIDExists($id) + public static function isIDExists($id, $module = null) { if (!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i', $id)) { return true; } - if (Context::isReservedWord(strtolower($id))) + if (Context::isReservedWord(strtolower($id)) && $id !== $module) { return true; }