From 7411b25113e3ad299c53c291964d0481309d0b28 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 17 Jan 2018 18:31:42 -0500 Subject: [PATCH] trying to fix the bug that causes gear with apostrophes in their name to be unusable --- code/modules/client/preferences.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7f9d928c9a..21f5222565 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -578,13 +578,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) continue var/class_link = "" if(gear.type in chosen_gear) - class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[j];toggle_gear=0'" + class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'" else if(gear_points <= 0) class_link = "style='white-space:normal;' class='linkOff'" else if(donoritem) - class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[j];toggle_gear=1'" + class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'" else - class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[j];toggle_gear=1'" + class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'" dat += "[j]" dat += "[gear.cost]" if(islist(gear.restricted_roles)) @@ -1686,7 +1686,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(i == href_list["select_category"]) gear_tab = i if(href_list["toggle_gear_path"]) - var/datum/gear/G = GLOB.loadout_items[gear_tab][href_list["toggle_gear_path"]] + var/datum/gear/G = GLOB.loadout_items[gear_tab][html_decode(href_list["toggle_gear_path"])] if(!G) return var/toggle = text2num(href_list["toggle_gear"])