[interchange-cvs] interchange - jon modified lib/Vend/Table/Editor.pm

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2006-01-30 17:50:03 GMT
Modified:  lib/Vend/Table Editor.pm
Log:
Remove compatible_5_2 pragma, which kept table editor error text
(mistakenly) hidden, as was the case up to Interchange 5.2.

Should be noted in UPGRADE document.

Revision  Changes    Path
1.82      +3 -11     interchange/lib/Vend/Table/Editor.pm


rev 1.82, prev_rev 1.81
Index: Editor.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/Editor.pm,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -u -r1.81 -r1.82
--- Editor.pm	8 Nov 2005 18:14:47 -0000	1.81
+++ Editor.pm	30 Jan 2006 17:50:03 -0000	1.82
@@ -1,6 +1,6 @@
 # Vend::Table::Editor - Swiss-army-knife table editor for Interchange
 #
-# $Id: Editor.pm,v 1.81 2005/11/08 18:14:47 jon Exp $
+# $Id: Editor.pm,v 1.82 2006/01/30 17:50:03 jon Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Table::Editor;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.81 $, 10);
+$VERSION = substr(q$Revision: 1.82 $, 10);
 
 use Vend::Util;
 use Vend::Interpolate;
@@ -3847,18 +3847,10 @@
 					};
 			if($opt->{all_errors}) {
 				$parm->{keep} = 1;
-				if(! $::Pragma->{compatible_5_2}) {
-					$parm->{text} = $opt->{error_template} || <<EOF;
+				$parm->{text} = $opt->{error_template} || <<EOF;
 <font color="$opt->{color_fail}">\$LABEL\$ (%s)</font>
 [else]{REQUIRED <b>}{LABEL}{REQUIRED </b>}[/else]
 EOF
-				}
-				else {
-					$parm->{text} = $opt->{error_template} || <<EOF;
-<font color="$opt->{color_fail}">\$LABEL\$</font><!--%s-->
-[else]{REQUIRED <b>}{LABEL}{REQUIRED </b>}[/else]
-EOF
-				}
 			}
 			$err_string = $Tag->error($parm);
 			if($template->{$c} !~ /{ERROR\??}/) {