[interchange-cvs] interchange - jon modified lib/Vend/Interpolate.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Thu Jan 23 23:53:00 2003
User: jon
Date: 2003-01-24 04:52:42 GMT
Modified: lib/Vend Tag: STABLE_4_8-branch Interpolate.pm
Log:
Merge from trunk:
* Ensure the $Tag object is not wrapped more than once.
Revision Changes Path
No revision
No revision
2.9.2.26 +5 -3 interchange/lib/Vend/Interpolate.pm
rev 2.9.2.26, prev_rev 2.9.2.25
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.9.2.25
retrieving revision 2.9.2.26
diff -u -u -r2.9.2.25 -r2.9.2.26
--- Interpolate.pm 23 Jan 2003 19:35:45 -0000 2.9.2.25
+++ Interpolate.pm 24 Jan 2003 04:52:41 -0000 2.9.2.26
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.9.2.25 2003/01/23 19:35:45 jon Exp $
+# $Id: Interpolate.pm,v 2.9.2.26 2003/01/24 04:52:41 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. and
# Interchange Development Group, http://www.icdevgroup.org/
@@ -28,7 +28,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.9.2.25 $, 10);
+$VERSION = substr(q$Revision: 2.9.2.26 $, 10);
@EXPORT = qw (
@@ -85,6 +85,8 @@
};
}
+my $tag_wrapped;
+
use strict;
use Vend::Util;
use Vend::Data;
@@ -2489,7 +2491,7 @@
}
}
- $Tag = $hole->wrap($Tag);
+ $Tag = $hole->wrap($Tag) if $hole and ! $tag_wrapped++;
init_calc() if ! $Vend::Calc_initialized;
$ready_safe->share(@share) if @share;