From a8749f107827b9bcda2771846d68a018d1f29716 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 12 Nov 2025 21:55:49 +0900 Subject: [PATCH] Clean up dead code #2612 --- modules/module/module.admin.controller.php | 8 -------- modules/module/module.controller.php | 5 ++--- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 8e4338cfb..ae7349cdb 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -326,8 +326,6 @@ class ModuleAdminController extends Module if(strlen($default)) { $grant->{$grant_name}[] = $default; - continue; - // users in a particular group } else { @@ -339,9 +337,7 @@ class ModuleAdminController extends Module else $group_srls = array($group_srls); $grant->{$grant_name} = $group_srls; } - continue; } - $grant->{$group_srls} = array(); // dead code???? } // Stored in the DB @@ -609,8 +605,6 @@ class ModuleAdminController extends Module if(strlen($default)) { $grant->{$grant_name}[] = $default; - continue; - // Users in a particular group } else { @@ -625,9 +619,7 @@ class ModuleAdminController extends Module } $grant->{$grant_name} = $group_srls; } - continue; } - $grant->{$group_srls} = array(); // dead code, too?? } // Stored in the DB diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index c7916f4cc..2df916409 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -937,8 +937,8 @@ class ModuleController extends Module } if(!$output->toBool()) { - return $output; $oDB->rollback(); + return $output; } } @@ -1192,12 +1192,11 @@ class ModuleController extends Module $args->module_filebox_srl = $vars->module_filebox_srl; $args->comment = $vars->comment; - return executeQuery('module.updateModuleFileBox', $args); + $output = executeQuery('module.updateModuleFileBox', $args); $output->add('save_filename', $save_filename); return $output; } - /** * @brief Add a file into the file box */