merge from 3.0 branch till 1363.

2 files changed, 17 insertions, 5 deletions

diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket274.page b/tests/FunctionalTests/tickets/protected/pages/Ticket274.page
index 4e1441ed..0b92cb40 100644
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket274.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket274.page
@@ -1,14 +1,14 @@
 <com:TContent ID="Content">

 

-<com:TDatePicker ID="MyDate" 

-		DateFormat="dd/MM/yyyy" 

+<com:TDatePicker ID="MyDate"

+		DateFormat="dd/MM/yyyy"

 		Mode="ImageButton" />

 	<com:TRequiredFieldValidator

-		ID="validator1" 

+		ID="validator1"

 		ControlToValidate="MyDate"

 		EnableClientScript="false"

 		ErrorMessage="date required (dd/MM/yyyy)" />

-		

+

 	<com:TDataTypeValidator

 		ID="validator2"

 		DataType="Date"

@@ -18,5 +18,5 @@
 		ErrorMessage="date must be of the form dd/MM/yyyy" />

 

 	<com:TButton ID="button1" Text="Submit!" />

-	

+

 </com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket351.page b/tests/FunctionalTests/tickets/protected/pages/Ticket351.page
new file mode 100644
index 00000000..5fb65f20
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket351.page
@@ -0,0 +1,12 @@
+<com:TContent ID="Content">

+<com:TDatePicker ID="Birthdate"

+	DateFormat="MMM/d/yyyy"

+	FromYear="1900" UpToYear="1990" InputMode="DropDownList" />

+

+<br />

+<%= $this->Birthdate->Date %>

+<br />

+<%= $this->Birthdate->TimeStamp %>

+

+<com:TButton Text="Submit!" />

+</com:TContent>
\ No newline at end of file