diff options
| -rwxr-xr-x | httpd/cgi-bin/check | 8 | ||||
| -rw-r--r-- | share/templates/en_US/error_loop.tmpl | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 8575a7e..acb65e4 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.614 2009-01-04 10:43:50 ville Exp $ +# $Id: check,v 1.615 2009-01-04 10:54:09 ville Exp $ # # Disable buffering on STDOUT! @@ -198,7 +198,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.614 $; + $VERSION = q$Revision: 1.615 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -1841,11 +1841,11 @@ sub report_errors ($) { foreach my $err (@{$File->{Errors}}) { my $line; my $col; - if ($err->{char} =~ /^[0-9]+$/ ){ + if (defined($err->{char}) && $err->{char} =~ /^[0-9]+$/ ){ ($line, $col) = &truncate_line($File->{Content}->[$err->{line}-1], $err->{char}); $line = &mark_error($line, $col); } - else { + elsif (defined($err->{line})) { $col = length($File->{Content}->[$err->{line}-1]); $col = 80 if ($col > 80); ($line, $col) = &truncate_line($File->{Content}->[$err->{line}-1], $col); diff --git a/share/templates/en_US/error_loop.tmpl b/share/templates/en_US/error_loop.tmpl index e1bad48..4522115 100644 --- a/share/templates/en_US/error_loop.tmpl +++ b/share/templates/en_US/error_loop.tmpl @@ -3,11 +3,11 @@ <TMPL_LOOP NAME="file_errors"> <li<TMPL_IF NAME="class"> class="<TMPL_VAR NAME="class">"</TMPL_IF>> <span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="Error" /></TMPL_IF></span> - <em>Line <a href="#line-<TMPL_VAR NAME="line" ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a>, - Column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>: + <TMPL_IF NAME="line"><em>Line <a href="#line-<TMPL_VAR NAME="line" ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a><TMPL_IF NAME="char">, + Column <TMPL_VAR NAME="char" ESCAPE="HTML"></TMPL_IF></em>:</TMPL_IF> <span class="msg"><TMPL_VAR NAME="msg"></span> <TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>. -<pre><code class="input"><TMPL_VAR NAME="src"></code></pre> +<TMPL_IF NAME="src"><pre><code class="input"><TMPL_VAR NAME="src"></code></pre></TMPL_IF> <TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> </li> </TMPL_LOOP> @@ -15,8 +15,8 @@ <TMPL_LOOP NAME="file_errors"> <li<TMPL_IF NAME="class"> class="<TMPL_VAR NAME="class">"</TMPL_IF>> <span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="Error" /></TMPL_IF></span> - <em>Line <TMPL_VAR NAME="line" ESCAPE="HTML">, Column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>: - <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<pre><code class="input"><TMPL_VAR NAME="src"></code></pre><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> </li> + <TMPL_IF NAME="line"><em>Line <TMPL_VAR NAME="line" ESCAPE="HTML"><TMPL_IF NAME="char">, Column <TMPL_VAR NAME="char" ESCAPE="HTML"></TMPL_IF></em>:</TMPL_IF> + <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<TMPL_IF NAME="src"><pre><code class="input"><TMPL_VAR NAME="src"></code></pre></TMPL_IF><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> </li> </TMPL_LOOP> </TMPL_IF> <TMPL_IF NAME="has_errors"></ol></TMPL_IF> |