please god tell me i fixed the morgue conflict

This commit is contained in:
pinatacolada
2016-08-04 18:50:05 +01:00
parent ea35dc2b24
commit 7d7c9aa647
1724 changed files with 65578 additions and 44979 deletions
+1 -1
View File
@@ -33,7 +33,7 @@
return
var/admin_sql_ckey = sanitizeSQL(adminckey)
if(!server)
if (config && config.server_name)
if(config && config.server_name)
server = config.server_name
server = sanitizeSQL(server)
var/DBQuery/query_noteadd = dbcon.NewQuery("INSERT INTO [format_table_name("notes")] (ckey, timestamp, notetext, adminckey, server) VALUES ('[target_sql_ckey]', '[timestamp]', '[notetext]', '[admin_sql_ckey]', '[server]')")