Merge pull request #1481 from Citadel-Station-13/upstream-merge-28183

[MIRROR] Trims whitelist entries and makes them use ckey()
2017-06-08 22:28:14 -05:00
parent 00790c0fdd 7b6c76525c
commit 8ef2931630
1 changed files with 1 additions and 1 deletions
--- a/code/modules/admin/whitelist.dm
+++ b/code/modules/admin/whitelist.dm
@@ -10,7 +10,7 @@ GLOBAL_PROTECT(whitelist)
 			continue
 		if(findtextEx(line,"#",1,2))
 			continue
-		GLOB.whitelist += line
+		GLOB.whitelist += ckey(line)

 	if(!GLOB.whitelist.len)
 		GLOB.whitelist = null