From 42fe77ad8c8986a3c7baea487115c3873378c4e0 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Sun, 13 Oct 2019 20:21:39 -0700 Subject: [PATCH] Fix single quotes showing up weird in names and announcement titles (#12583) --- code/__HELPERS/text.dm | 4 ++-- code/modules/admin/verbs/randomverbs.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 08af11a128c..f3b76064517 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -130,7 +130,7 @@ //Filters out undesirable characters from names /proc/reject_bad_name(var/t_in, var/allow_numbers=0, var/max_length=MAX_NAME_LEN) - // Decode so that names with characters like < are still rejected. Will be encoded again at the end + // Decode so that names with characters like < are still rejected t_in = html_decode(t_in) if(!t_in || length(t_in) > max_length) return //Rejects the input if it is null or if it is longer than the max length allowed @@ -192,7 +192,7 @@ for(var/bad_name in list("space","floor","wall","r-wall","monkey","unknown","inactive ai","plating")) //prevents these common metagamey names if(cmptext(t_out,bad_name)) return //(not case sensitive) - return html_encode(t_out) + return t_out //checks text for html tags //if tag is not in whitelist (var/list/paper_tag_whitelist in global.dm) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index f5f0bac040b..a638bae3503 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -612,7 +612,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(type == "Custom") type = clean_input("What would you like the report type to be?", "Report Type", "Encrypted Transmission") - var/customname = clean_input("Pick a title for the report.", "Title", MsgType[type]) + var/customname = input(usr, "Pick a title for the report.", "Title", MsgType[type]) as text|null if(!customname) return var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What's the message?") as message|null