cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'json' into Bleeding-Edge" (#14425)

Browse Source 
This reverts commit 24f7c0a960, reversing
changes made to ff9b9664ea.
This commit is contained in:
sood
2017-03-24 22:19:34 -07:00
committed by GitHub
parent 7678fd914b
commit d0d4b09ec9
8 changed files with 378 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
goon/code/datums/browserOutput.dm
View File

@@ -150,7 +150,7 @@ For the main html chat area
deets["clientData"]["ckey"] = owner.ckey
deets["clientData"]["ip"] = owner.address
deets["clientData"]["compid"] = owner.computer_id
var/data = json_encode(deets)
var/data = list2json(deets)
ehjax_send(data = data)
//Called by client, sent data to investigate (cookie history so far)
@@ -159,7 +159,7 @@ For the main html chat area
return
if(cookie != "none")
var/list/connData = json_decode(cookie)
var/list/connData = json2list(cookie)
if (connData && islist(connData) && connData.len > 0 && connData["connData"])
src.connectionHistory = connData["connData"] //lol fuck
var/list/found = new()