validator/httpd/cgi-bin check,1.454,1.455

• From: Bjoern Hoehrmann via cvs-syncmail <cvsmail@w3.org>
• Date: Sun, 25 Sep 2005 00:13:36 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1EJK9A-0002Ak-22@lionel-hutz.w3.org>

Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv8342

Modified Files:
	check 
Log Message:
someone should be more careful when merging patches...

Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -d -r1.454 -r1.455
--- check	21 Sep 2005 08:51:34 -0000	1.454
+++ check	25 Sep 2005 00:13:33 -0000	1.455
@@ -1530,7 +1530,7 @@
       W18_xml  => $File->{Charset}->{XML},
       W18_use  => $File->{Charset}->{Use},
     });
-  } elsif (&conflict($File->{Charset}->{HTTP}, $File->{Charset}->{META}) and not ($File->{'Direct Input'})) {
+  } elsif (charset_not_equal($File->{Charset}->{HTTP}, $File->{Charset}->{META}) and not ($File->{'Direct Input'})) {
     &add_warning('W19', {
       W19_http => $File->{Charset}->{HTTP},
       W19_meta => $File->{Charset}->{META},

Received on Sunday, 25 September 2005 00:13:40 UTC