From c92e2365a7fd955800e8a38fb36f4e9458dac24d Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sat, 5 Dec 2015 11:16:33 +0100
Subject: Remove the patch CP feature (Bug #5594)

GUI instructions left in place of the original checkbox.
---
 config/squid3/34/squid.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/squid3/34/squid.xml b/config/squid3/34/squid.xml
index 82fe44b8..3538a5fe 100644
--- a/config/squid3/34/squid.xml
+++ b/config/squid3/34/squid.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>squid</name>
-	<version>0.4.5</version>
+	<version>0.4.7</version>
 	<title>Proxy Server: General Settings</title>
 	<include_file>/usr/local/pkg/squid.inc</include_file>
 	<menu>
@@ -324,15 +324,14 @@
 		</field>
 		<field>
 			<fielddescr>Patch Captive Portal</fielddescr>
-			<fieldname>patch_cp</fieldname>
 			<description>
 				<![CDATA[
-				Enable this option to force Captive Portal to non transparent proxy users.<br/>
-				<strong>Note:</strong> You may need to reapply Captive Portal settings after changing this option.<br/>
-				<strong><span class="errmsg">Warning:</span> This alters /etc/inc/captiveportal.inc file! USE WITH CAUTION!</strong> (A backup is made available under /root directory.)
+				<strong><span class="errmsg">This feature was removed</span></strong> - see <a href="https://redmine.pfsense.org/issues/5594">Bug #5594</a> for details!<br/>
+				If you were using this feature, double-check '/etc/inc/captiveportal.inc' content for sanity.<br/>
+				Get a <a href="https://github.com/pfsense/pfsense/blob/RELENG_2_2/etc/inc/captiveportal.inc">sane copy of the file from pfSense GitHub repository</a> if needed.
 				]]>
 			</description>
-			<type>checkbox</type>
+			<type>info</type>
 		</field>
 		<field>
 			<fielddescr>Resolve DNS IPv4 First</fielddescr>
-- 
cgit v1.2.3