[interchange-cvs] interchange - heins modified code/SystemTag/include.coretag

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-06-19 18:23:28 GMT
Modified:  code/SystemTag include.coretag
Log:
* Change tag to increment whether include succeeeds or not -- otherwise
  would fail when multiple instances of include tag were present.

Revision  Changes    Path
1.5       +6 -5      interchange/code/SystemTag/include.coretag


rev 1.5, prev_rev 1.4
Index: include.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/include.coretag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- include.coretag	19 Jun 2004 18:04:26 -0000	1.4
+++ include.coretag	19 Jun 2004 18:23:28 -0000	1.5
@@ -1,6 +1,6 @@
 UserTag include             Order        file locale
 UserTag include             PosNumber    2
-UserTag include             Version      $Revision: 1.4 $
+UserTag include             Version      $Revision: 1.5 $
 UserTag include             Routine      <<EOR
 sub {
 	my ($file, $locale) = @_;
@@ -9,16 +9,17 @@
 	$::Instance->{include_depth} ||= 0;
 	my $limit = $Vend::Cfg->{Limit}{include_depth} || 10;
 
-	if($::Instance->{include_depth} >= $limit) {
-		logError(
-				"Depth of include exceeds limit of %s for file %s.", 
+	if($::Instance->{include_depth}++ >= $limit) {
+		logOnce(
+				'error',
+				"Depth of include (%s) exceeds limit of %s for file %s.", 
 				$::Instance->{include_depth},
+				$limit,
 				$file,
 			);
 		return;
 	}
 
-	$::Instance->{include_depth}++;
 	my $out = Vend::Interpolate::interpolate_html(
 					Vend::Util::readfile($file, undef, $locale)
 				);