diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee index 56789be3d..f9bb6fd61 100755 --- a/src/Archive/Redirect.coffee +++ b/src/Archive/Redirect.coffee @@ -79,7 +79,7 @@ Redirect = securityCheck: (URL) -> /^https:\/\//.test(URL) or location.protocol is 'http:' or - Conf['Allow Mixed Content from Archives'] + Conf['Except Archives from Encryption'] navigate: (URL, alternative) -> if URL and ( diff --git a/src/General/Config.coffee b/src/General/Config.coffee index dcb9c564a..7881bc9e6 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -27,11 +27,11 @@ Config = ] '404 Redirect': [ true - 'Redirect dead threads and images.' + 'Redirect dead threads and images to the archives.' ] - 'Allow Mixed Content from Archives': [ + 'Except Archives from Encryption': [ false - 'Permit warningless access to HTTP-only archives from HTTPS pages.' + 'Permit loading content from, and warningless redirects to, HTTP-only archives from HTTPS pages.' ] 'Keybinds': [ true diff --git a/src/General/Get.coffee b/src/General/Get.coffee index daaff48b4..ccad005f5 100755 --- a/src/General/Get.coffee +++ b/src/General/Get.coffee @@ -140,7 +140,7 @@ Get = responseType: 'json' withCredentials: url.archive.withCredentials return true - else if Conf['Allow Mixed Content from Archives'] + else if Conf['Except Archives from Encryption'] CrossOrigin.json url, (response) -> Get.parseArchivedPost response, boardID, postID, root, context return true