diff options
| author | ot <ot@localhost> | 2006-10-12 04:30:50 +0000 |
|---|---|---|
| committer | ot <ot@localhost> | 2006-10-12 04:30:50 +0000 |
| commit | f67873df22953030015da911100c10ada0dc6dfb (patch) | |
| tree | fefbc81a80d557a0e4f6879ff79dc19e36699a22 | |
| parent | a2bcd2070ebf91f3dd3d3c63c74605666c52864a (diff) | |
| download | markup-validator-f67873df22953030015da911100c10ada0dc6dfb.zip markup-validator-f67873df22953030015da911100c10ada0dc6dfb.tar.gz markup-validator-f67873df22953030015da911100c10ada0dc6dfb.tar.bz2 | |
fixing template order and logic to show warning about absence of character encoding
before fatal error when transcoding to utf-8 failed
http://www.w3.org/Bugs/Public/show_bug.cgi?id=3642
(porting to HEAD code)
| -rwxr-xr-x | httpd/cgi-bin/check | 6 | ||||
| -rw-r--r-- | share/templates/en_US/fatal-error.tmpl | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 65d16fc..2b181e6 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.463 2006-08-26 13:09:11 ville Exp $ +# $Id: check,v 1.464 2006-10-12 04:30:49 ot Exp $ # # Disable buffering on STDOUT! @@ -180,7 +180,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.463 $; + $VERSION = q$Revision: 1.464 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -863,6 +863,8 @@ sub add_warning ($$) { push @{$File->{Warnings}}, $WID; $File->{T}->param($WID => TRUE, %{$params}); $File->{T}->param(have_warnings => TRUE); + $File->{E}->param($WID => TRUE, %{$params}); + $File->{E}->param(have_warnings => TRUE); $File->{S}->param($WID => TRUE, %{$params}); $File->{S}->param(have_warnings => TRUE); } diff --git a/share/templates/en_US/fatal-error.tmpl b/share/templates/en_US/fatal-error.tmpl index fd317f7..4ae73e7 100644 --- a/share/templates/en_US/fatal-error.tmpl +++ b/share/templates/en_US/fatal-error.tmpl @@ -4,6 +4,12 @@ <div id="head"> <TMPL_INCLUDE NAME="table.tmpl"> </div><!-- end of "head" --> + <TMPL_IF NAME="have_warnings"> + <TMPL_INCLUDE NAME="warnings.tmpl"> + </TMPL_IF> + + <div id="result"> + <h2 id="results" class="invalid">Sorry! This document can not be checked.</h2> <a id="skip" name="skip"></a> <TMPL_IF NAME="fatal_transcode_error"> @@ -154,7 +160,7 @@ page by URL. </p> </TMPL_IF> - +</div><!-- results --> </div><!-- end of "main" --> <TMPL_INCLUDE NAME="footer.tmpl"> |