jon 01/05/14 12:25:43
Modified: src/java/org/apache/turbine/modules/navigations
VelocityNavigation.java
Log:
no need to add extra slash if we don't need to
Revision Changes Path
1.7 +9 -2
jakarta-turbine/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Index: VelocityNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityNavigation.java 2001/05/07 14:38:20 1.6
+++ VelocityNavigation.java 2001/05/14 19:25:32 1.7
@@ -73,7 +73,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: VelocityNavigation.java,v 1.6 2001/05/07 14:38:20 mpoeschl Exp $
+ * @version $Id: VelocityNavigation.java,v 1.7 2001/05/14 19:25:32 jon Exp $
*/
public class VelocityNavigation extends TemplateNavigation
{
@@ -122,8 +122,15 @@
StringElement output = new StringElement();
output.setFilterState(false);
+
+ // Usually adds the leading slash, but make it sure.
+ if ((templateName.length() > 0) &&
+ (templateName.charAt(0) != '/'))
+ {
+ templateName = '/' + templateName;
+ }
output.addElement( TurbineVelocity
- .handleRequest(context,"navigations/" + templateName) );
+ .handleRequest(context,"navigations" + templateName) );
return output;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
