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

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2002-03-18 20:18:59 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Interpolate.pm
Log:
Allow output of '0' from [if]...[else]0[/else][/if].
Thanks to Murahashi <murahashi@ayayu.com> for finding this bug.

(Already in 4.9 trunk.)

Revision  Changes    Path
No                   revision



No                   revision



2.9.2.15  +6 -6      interchange/lib/Vend/Interpolate.pm


rev 2.9.2.15, prev_rev 2.9.2.14
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.9.2.14
retrieving revision 2.9.2.15
diff -u -u -r2.9.2.14 -r2.9.2.15
--- Interpolate.pm	1 Mar 2002 20:10:53 -0000	2.9.2.14
+++ Interpolate.pm	18 Mar 2002 20:18:59 -0000	2.9.2.15
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.9.2.14 2002/03/01 20:10:53 racke Exp $
+# $Id: Interpolate.pm,v 2.9.2.15 2002/03/18 20:18:59 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.9.2.14 $, 10);
+$VERSION = substr(q$Revision: 2.9.2.15 $, 10);
 
 @EXPORT = qw (
 
@@ -1491,11 +1491,11 @@
 		$out = $body;
 	}
 	elsif ($elsif) {
-		$else = '[else]' . $else . '[/else]' if $else;
+		$else = '[else]' . $else . '[/else]' if length $else;
 		$elsif =~ s#(.*?)$QR{'/elsif'}(.*)#$1${2}[/elsif]#s;
 		$out = '[if ' . $elsif . $else . '[/if]';
 	}
-	elsif ($else) {
+	elsif (length $else) {
 		$out = $else;
 	}
 	return $out;
@@ -3717,11 +3717,11 @@
 		$out = $body;
 	}
 	elsif ($elsif) {
-		$else = '[else]' . $else . '[/else]' if $else;
+		$else = '[else]' . $else . '[/else]' if length $else;
 		$elsif =~ s#(.*?)$QR{'/elsif'}(.*)#$1${2}[/elsif]#s;
 		$out = '[if ' . $elsif . $else . '[/if]';
 	}
-	elsif ($else) {
+	elsif (length $else) {
 		$out = $else;
 	}
 	else {