From 0a6e48ab8a35a8f8f426741b1319e915d6431731 Mon Sep 17 00:00:00 2001 From: skull132 Date: Fri, 5 Aug 2016 15:20:42 +0300 Subject: [PATCH] Resolve #260 (#679) Re-enable HTML mark-up in narrates Because we trust the admins not to abuse HTML, right? Riiiiight? --- code/modules/admin/verbs/randomverbs.dm | 4 ++-- html/changelogs/skull132-PR-679.yml | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/skull132-PR-679.yml diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 7541a735ce8..beafc8109fa 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -109,7 +109,7 @@ src << "Only administrators may use this command." return - var/msg = sanitize(input("Message:", text("Enter the text you wish to appear to everyone:")) as text) + var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to everyone:")) as text)) if (!msg) return @@ -132,7 +132,7 @@ if(!M) return - var/msg = sanitize(input("Message:", text("Enter the text you wish to appear to your target:")) as text) + var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to your target:")) as text)) if( !msg ) return diff --git a/html/changelogs/skull132-PR-679.yml b/html/changelogs/skull132-PR-679.yml new file mode 100644 index 00000000000..c3964a90c21 --- /dev/null +++ b/html/changelogs/skull132-PR-679.yml @@ -0,0 +1,13 @@ +# Your name. +author: Skull132 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "HTML parsing is re-enabled in direct and global narrate, for admins."