Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory sc8-pr-cvs1:/tmp/cvs-serv2879/src/org/webmacro/directive
Modified Files:
IncludeDirective.java
Log Message:
Fix problem where #include as macro includes the template name in the output instead of interpolating the template at build time against the build context
Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** IncludeDirective.java 16 Jul 2003 06:44:59 -0000 1.23
--- IncludeDirective.java 16 Jul 2003 07:04:20 -0000 1.24
***************
*** 318,322 ****
throw makeBuildException("Unable to include as macro", e);
}
! return t;
}
else if (_type == TYPE_DYNAMIC)
--- 318,327 ----
throw makeBuildException("Unable to include as macro", e);
}
! try {
! return t.evaluateAsString(bc);
! }
! catch (PropertyException e) {
! return "";
! }
}
else if (_type == TYPE_DYNAMIC)
|
