From ccb8a98a85c32cc5702899c1d26c69a7c563d65d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 25 May 2018 11:36:55 -0400 Subject: [PATCH] Merge pull request #38047 from tgstation/MrStonedOne-patch-1 Sync permanent admin removals to the players table immediately --- code/modules/admin/permissionedit.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm index 44163c2a73..e237a18f6a 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -222,6 +222,7 @@ var/datum/DBQuery/query_add_rank_log = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES ('[SQLtime()]', '[GLOB.round_id]', '[sanitizeSQL(usr.ckey)]', INET_ATON('[sanitizeSQL(usr.client.address)]'), 'remove admin', '[admin_ckey]', 'Admin removed: [admin_ckey]')") if(!query_add_rank_log.warn_execute()) return + sync_lastadminrank(admin_ckey) message_admins("[key_name_admin(usr)] removed [admin_ckey] from the admins list [use_db ? "permanently" : "temporarily"]") log_admin("[key_name(usr)] removed [admin_ckey] from the admins list [use_db ? "permanently" : "temporarily"]") @@ -386,7 +387,9 @@ log_admin("[key_name(usr)] removed rank [admin_rank] permanently") /datum/admins/proc/sync_lastadminrank(admin_ckey, datum/admins/D) - var/sqlrank = sanitizeSQL(D.rank.name) + var/sqlrank = "Player" + if (D) + sqlrank = sanitizeSQL(D.rank.name) admin_ckey = sanitizeSQL(admin_ckey) var/datum/DBQuery/query_sync_lastadminrank = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET lastadminrank = '[sqlrank]' WHERE ckey = '[admin_ckey]'") if(!query_sync_lastadminrank.warn_execute())