From 29d78aa0f5d51e88a28340b45d2e0196386a1a4e Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Wed, 9 Nov 2016 15:17:18 -0800
Subject: [PATCH] Fix deletion cooldown bug from v1.13.1.0.

---
 src/Posting/QR.cooldown.coffee | 4 +++-
 src/classes/Board.coffee       | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Posting/QR.cooldown.coffee b/src/Posting/QR.cooldown.coffee
index 1b18148b4..de87327bc 100644
--- a/src/Posting/QR.cooldown.coffee
+++ b/src/Posting/QR.cooldown.coffee
@@ -1,5 +1,7 @@
 QR.cooldown =
   seconds: 0
+  delays:
+    deletion: 60 # cooldown for deleting posts/files
 
   # Called from Main
   init: ->
@@ -10,7 +12,7 @@ QR.cooldown =
   # Called from QR
   setup: ->
     # Read cooldown times
-    QR.cooldown.delays = g.BOARD.cooldowns()
+    $.extend QR.cooldown.delays, g.BOARD.cooldowns()
 
     # The longest reply cooldown, for use in pruning old reply data
     QR.cooldown.maxDelay = 0
diff --git a/src/classes/Board.coffee b/src/classes/Board.coffee
index de2d91116..9ec44ea26 100644
--- a/src/classes/Board.coffee
+++ b/src/classes/Board.coffee
@@ -14,7 +14,6 @@ class Board
       thread: c2.threads or 0
       reply:  c2.replies or 0
       image:  c2.images  or 0
-      deletion: 60       # cooldown for deleting posts/files
       thread_global: 300 # inter-board thread cooldown
     # Pass users have reduced cooldowns.
     if d.cookie.indexOf('pass_enabled=1') >= 0