diff --git a/code/controllers/subsystem/changelog.dm b/code/controllers/subsystem/changelog.dm index 5694ceccfb5..8379e1a387c 100644 --- a/code/controllers/subsystem/changelog.dm +++ b/code/controllers/subsystem/changelog.dm @@ -197,7 +197,7 @@ SUBSYSTEM_DEF(changelog) // Now we gather the data from the DB var/datum/db_query/pr_meta = SSdbcore.NewQuery( - "SELECT author, DATE(date_merged) AS date FROM changelog WHERE pr_number = :prnum LIMIT 1", + "SELECT author, DATE_FORMAT(date_merged, '%Y-%m-%d at %T') AS date FROM changelog WHERE pr_number = :prnum LIMIT 1", list("prnum" = pr_number) ) diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index 65b5b546138..249b7c4ddae 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -14,7 +14,7 @@ if(!SSdbcore.IsConnected()) return - + var/datum/db_query/log_query = SSdbcore.NewQuery({" INSERT INTO [format_table_name("karma")] (spendername, spenderkey, receivername, receiverkey, receiverrole, receiverspecial, spenderip, time) VALUES (:sname, :skey, :rname, :rkey, :rrole, :rspecial, :sip, Now())"}, list( @@ -36,7 +36,7 @@ var/datum/db_query/select_spender = SSdbcore.NewQuery("SELECT id, karma FROM [format_table_name("karmatotals")] WHERE byondkey=:rkey", list( "rkey" = receiver.ckey )) - + if(!select_spender.warn_execute()) qdel(select_spender) return @@ -238,7 +238,7 @@ GLOBAL_LIST_EMPTY(karma_spenders) dbckey = query.item[1] dbjob = query.item[2] dbspecies = query.item[3] - + qdel(query) if(dbckey) @@ -406,7 +406,7 @@ GLOBAL_LIST_EMPTY(karma_spenders) to_chat(usr, "You have unlocked [job].") message_admins("[key_name(usr)] has unlocked [job].") // why do we admin log this karmacharge(cost) - + qdel(insert_query) if(dbckey) @@ -443,6 +443,7 @@ GLOBAL_LIST_EMPTY(karma_spenders) while(select_query.NextRow()) dbckey = select_query.item[1] dbspecies = select_query.item[2] + qdel(select_query) if(!dbckey) var/datum/db_query/insert_query = SSdbcore.NewQuery("INSERT INTO [format_table_name("whitelist")] (ckey, species) VALUES (:ckey, :species)", list( "ckey" = ckey, @@ -497,11 +498,13 @@ GLOBAL_LIST_EMPTY(karma_spenders) "ckey" = ckey )) if(!update_query.warn_execute()) + qdel(select_query) qdel(update_query) return else to_chat(usr, "You have been [refund ? "refunded" : "charged"] [cost] karma.") message_admins("[key_name(usr)] has been [refund ? "refunded" : "charged"] [cost] karma.") + qdel(select_query) qdel(update_query) return