From 0387642fcb18607e86e4dbc3d3924b6c58145e0d Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 20 Nov 2015 04:20:46 -0800
Subject: [PATCH] We do need to remove the old captcha when forcing noscript
 one.

Fix for 210b6bd20161286ace683ad1590a8df637f60de7.
---
 src/Posting/Captcha.replace.coffee | 3 ++-
 src/Posting/Captcha.v2.coffee      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Posting/Captcha.replace.coffee b/src/Posting/Captcha.replace.coffee
index d979c50ab..6ca384ad0 100644
--- a/src/Posting/Captcha.replace.coffee
+++ b/src/Posting/Captcha.replace.coffee
@@ -24,10 +24,11 @@ Captcha.replace =
   noscript: ->
     return unless (original = $ '#g-recaptcha, #captchaContainerAlt') and (noscript = $ 'noscript')
     span = $.el 'span',
+      id: 'captcha-forced-noscript'
       innerHTML: noscript.textContent
     Captcha.replace.iframe $('iframe', span)
     $.replace noscript, span
-    original.hidden = true
+    $.rm original
 
   v1: ->
     return unless $.id 'g-recaptcha'
diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee
index 22556c95b..fa366d75d 100644
--- a/src/Posting/Captcha.v2.coffee
+++ b/src/Posting/Captcha.v2.coffee
@@ -3,7 +3,7 @@ Captcha.v2 =
 
   init: ->
     return if d.cookie.indexOf('pass_enabled=1') >= 0
-    return unless (@isEnabled = !!$ '#g-recaptcha, #captchaContainerAlt')
+    return unless (@isEnabled = !!$ '#g-recaptcha, #captchaContainerAlt, #captcha-forced-noscript')
 
     if (@noscript = Conf['Force Noscript Captcha'] or not Main.jsEnabled)
       $.addClass QR.nodes.el, 'noscript-captcha'