From 150fec22562b56b9ac7f75aeb4158f4671371371 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Wed, 28 Feb 2007 02:48:06 +0000
Subject: [PATCH] WW-1777 DateTimePicker now supports expressions in the
 property "displayFormat"

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@512580 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/struts2/components/DateTimePicker.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/components/DateTimePicker.java b/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
index 64f6b26e8..bcb09a42c 100644
--- a/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
+++ b/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
@@ -299,13 +299,13 @@ public class DateTimePicker extends UIBean {
             // try to parse a date
             String dateStr = obj.toString();
             if(dateStr.equalsIgnoreCase("today"))
-                return  RFC3339_FORMAT.format(new Date());
+                return RFC3339_FORMAT.format(new Date());
 
             try {
                 Date date = null;
                 if(this.displayFormat != null) {
                     SimpleDateFormat format = new SimpleDateFormat(
-                            this.displayFormat);
+                            (String) getParameters().get("displayFormat"));
                     date = format.parse(dateStr);
                     return RFC3339_FORMAT.format(date);
                 } else {