From b824b5f180b62fcef5d131cb962ac5c2aca8a7f7 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 30 Jan 2015 20:44:28 -0800
Subject: [PATCH] Merge from Appchan X: src/Archive

---
 src/Archive/Redirect.coffee | 2 +-
 src/General/Config.coffee   | 2 +-
 src/General/Get.coffee      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee
index b3c1185a3..ed406eb38 100755
--- a/src/Archive/Redirect.coffee
+++ b/src/Archive/Redirect.coffee
@@ -87,7 +87,7 @@ Redirect =
   securityCheck: (URL) ->
     /^https:\/\//.test(URL) or
     location.protocol is 'http:' or
-    Conf['Except Archives from Encryption']
+    Conf['Exempt Archives from Encryption']
 
   navigate: (URL, alternative) ->
     if URL and (
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index cad7028bd..d948056ab 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -30,7 +30,7 @@ Config =
         true
         'Redirect dead threads and images to the archives.'
       ]
-      'Except Archives from Encryption': [
+      'Exempt Archives from Encryption': [
         false
         'Permit loading content from, and warningless redirects to, HTTP-only archives from HTTPS pages.'
       ]
diff --git a/src/General/Get.coffee b/src/General/Get.coffee
index 13186d583..6d174eb1c 100755
--- a/src/General/Get.coffee
+++ b/src/General/Get.coffee
@@ -157,7 +157,7 @@ Get =
         responseType: 'json'
         withCredentials: url.archive.withCredentials
       return true
-    else if Conf['Except Archives from Encryption']
+    else if Conf['Exempt Archives from Encryption']
       CrossOrigin.json url, (response) ->
         {media} = response
         if media then for key of media when /_link$/.test key