Index: src/com/ecyrd/jspwiki/VariableManager.java
===================================================================
--- src/com/ecyrd/jspwiki/VariableManager.java	(revision 731590)
+++ src/com/ecyrd/jspwiki/VariableManager.java	(working copy)
@@ -22,6 +22,7 @@
 
 import java.lang.reflect.Method;
 import java.security.Principal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -330,7 +331,37 @@
                     return s;
                 }
             }
+
             
+            if( name.startsWith("timestamp") )
+            {
+                //get Timeformat (example: timestamp=yyyy-MM-dd) from varName to ignore the lowerCase of name
+                String timestampValue = varName;
+                StringTokenizer stringToken = new StringTokenizer(timestampValue, "=");
+                String dateFormat = "";
+                while (stringToken.hasMoreTokens())
+                {
+                    String paramName = (String) stringToken.nextToken();
+                    if (!paramName.startsWith("timestamp"))
+                        dateFormat = paramName;
+                }
+                if (dateFormat.length() > 0)
+                {
+                    try
+                    {
+                    SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+                    Date dStart = new Date(System.currentTimeMillis());
+                    return sdf.format(dStart);              
+                    }
+                    catch (Throwable t)
+                    {
+                        return "Exception: No valid dateformat was provided: " + dateFormat;
+                    }
+                }
+                else
+                    return "No dateformat was provided.";
+            }                 
+            
             //
             //  Final defaults for some known quantities.
             //