From ee9349c734531c0e9c730cf9c4966abc8ad60f22 Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Sat, 5 Aug 2023 01:37:23 +0900
Subject: [PATCH] Add group_srl to result of insertGroup()

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

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 9a9b39cff..e0b596247 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -1347,29 +1347,21 @@ class MemberAdminController extends Member
 		}
 
 		// Check the value of is_default.
-		if($args->is_default != 'Y')
-		{
-			$args->is_default = 'N';
-		}
-		else
+		$args->is_default = $args->is_default ?? 'N';
+		if($args->is_default === 'Y')
 		{
 			$output = executeQuery('member.updateGroupDefaultClear', $args);
 			if(!$output->toBool()) return $output;
 		}
-
-		if(!isset($args->list_order) || $args->list_order=='')
-		{
-			$args->list_order = $args->group_srl;
-		}
-
-		if(!$args->group_srl) $args->group_srl = getNextSequence();
-		$args->list_order = $args->group_srl;
+		if(empty($args->group_srl)) $args->group_srl = getNextSequence();
+		$args->list_order = $args->list_order ?? $args->group_srl;
 		$output = executeQuery('member.insertGroup', $args);
 		$this->_deleteMemberGroupCache();
 
 		// Call trigger (after)
 		ModuleHandler::triggerCall('member.insertGroup', 'after', $args);
 
+		$output->add('group_srl', $args->group_srl);
 		return $output;
 	}