[interchange] Fix URL splittor when MV_HTML4_COMPLIANT is enabled.

Stefan Hornburg interchange-cvs at icdevgroup.org
Tue Jan 4 15:19:15 UTC 2011


commit 4860c49a8ca8029d8d7bc798477d05be8bfd4d58
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Tue Jan 4 10:01:35 2011 -0500

    Fix URL splittor when MV_HTML4_COMPLIANT is enabled.
    Regular expression still supports inbound links with & instead of &amp; as separator.

 lib/Vend/Config.pm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index 15fb857..621e6f9 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -3637,9 +3637,15 @@ sub set_default_search {
 );
 
 sub global_directive_postprocess {
-	if($Global::UrlSepChar eq '&') {
-		$Global::UrlJoiner = $Global::Variable->{MV_HTML4_COMPLIANT} ? '&amp;' : '&';
-		$Global::UrlSplittor = qr/\&/;
+	if ($Global::UrlSepChar eq '&') {
+		if ($Global::Variable->{MV_HTML4_COMPLIANT}) {
+			$Global::UrlJoiner = '&amp;';
+			$Global::UrlSplittor = qr/\&amp;|\&/;
+		}
+		else {
+			$Global::UrlJoiner = '&';
+			$Global::UrlSplittor = qr/\&/;
+		}
 	}
 	else {
 		$Global::UrlJoiner = $Global::UrlSepChar;



More information about the interchange-cvs mailing list