From 4d40b30c2869dace58e133b680f401bd08283337 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 8 Aug 2014 21:24:41 -0700 Subject: [PATCH] archive features should be disableable --- src/General/Get.coffee | 1 + src/Images/ImageCommon.coffee | 2 +- src/Monitoring/ThreadWatcher.coffee | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/General/Get.coffee b/src/General/Get.coffee index f983e5b9b..daaff48b4 100755 --- a/src/General/Get.coffee +++ b/src/General/Get.coffee @@ -131,6 +131,7 @@ Get = Main.callbackNodes Post, [post] Get.insert post, root, context archivedPost: (boardID, postID, root, context) -> + return false unless Conf['Resurrect Quotes'] return false unless url = Redirect.to 'post', {boardID, postID} if /^https:\/\//.test(URL) or location.protocol is 'http:' $.cache url, diff --git a/src/Images/ImageCommon.coffee b/src/Images/ImageCommon.coffee index 091e86161..b5ba44a48 100644 --- a/src/Images/ImageCommon.coffee +++ b/src/Images/ImageCommon.coffee @@ -12,7 +12,7 @@ ImageCommon = URL = Redirect.to 'file', boardID: post.board.ID filename: src[src.length - 1] - unless URL and Redirect.securityCheck URL + unless Conf['404 Redirect'] and URL and Redirect.securityCheck URL URL = null return cb URL if (post.isDead or post.file.isDead) and file.src.split('/')[2] is 'i.4cdn.org' diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee index 00d2923d1..4f7206205 100755 --- a/src/Monitoring/ThreadWatcher.coffee +++ b/src/Monitoring/ThreadWatcher.coffee @@ -157,7 +157,7 @@ ThreadWatcher = href: 'javascript:;' $.on x, 'click', ThreadWatcher.cb.rm - if data.isDead + if Conf['404 Redirect'] and data.isDead href = Redirect.to 'thread', {boardID, threadID} link = $.el 'a', href: href or "/#{boardID}/thread/#{threadID}"