From fcbf3ce6f5e139a3ce8b5e5ff4fa5c302caba5e5 Mon Sep 17 00:00:00 2001
From: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com>
Date: Sun, 20 Oct 2019 05:43:33 +0200
Subject: [PATCH] Allows admins to delete notes they made under all
 circumstances (#24450)

* Allows admins to delete notes they made under all circumstances

* Actually using my brain for once!

* Should fix it
---
 code/modules/admin/admin.dm        | 2 +-
 code/modules/admin/player_notes.dm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 4179c05625c..134c38dec89 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -399,7 +399,7 @@ var/global/floorIsLava = 0
 				I.rank = "N/A"
 				update_file = 1
 			dat += "<font color=#008800>[I.content]</font> <i>by [I.author] ([I.rank])</i> on <i><font color=blue>[I.timestamp]</i></font> "
-			if(I.author == usr.key || check_rights(R_PERMISSIONS, show_msg = 0))
+			if(ckey(I.author) == usr.ckey || check_rights(R_PERMISSIONS, show_msg = 0)) // Older notes stored the key of the banning admin.
 				dat += "<A href='?src=\ref[src];remove_player_info=[key];remove_index=[i]'>Remove</A>"
 			dat += "<br><br>"
 		if(update_file)
diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm
index 9bc4785edec..8659d19b5ac 100644
--- a/code/modules/admin/player_notes.dm
+++ b/code/modules/admin/player_notes.dm
@@ -120,7 +120,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 
 	var/datum/player_info/P = new
 	if (usr)
-		P.author = usr.key
+		P.author = usr.ckey
 		P.rank = usr.client.holder.rank
 	else
 		P.author = "Adminbot"