From 0ef85632c1fc0694897cc13c859503016c317f85 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 11 Aug 2023 00:40:13 +0900 Subject: [PATCH] Allow module update even if moduleUpdate() method does not exist --- modules/install/install.admin.controller.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index feca76eee..d67dc5453 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -36,24 +36,25 @@ class installAdminController extends install { @set_time_limit(0); $module_name = Context::get('module_name'); - if(!$module_name) throw new Rhymix\Framework\Exceptions\InvalidRequest; - - $oModule = ModuleModel::getModuleInstallClass($module_name); - if(!$oModule || !method_exists($oModule, 'moduleUpdate')) + if(!$module_name) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } Rhymix\Framework\Session::close(); - $output = $oModule->moduleUpdate(); - if($output instanceof BaseObject && !$output->toBool()) + $oModuleController = ModuleController::getInstance(); + $oModule = ModuleModel::getModuleInstallClass($module_name); + if($oModule && method_exists($oModule, 'moduleUpdate')) { - Rhymix\Framework\Session::start(); - return $output; + $output = $oModule->moduleUpdate(); + if($output instanceof BaseObject && !$output->toBool()) + { + Rhymix\Framework\Session::start(); + return $output; + } } - $oModuleController = getController('module'); $output = $oModuleController->registerActionForwardRoutes($module_name); if($output instanceof BaseObject && !$output->toBool()) {