2 files changed, 2 insertions, 2 deletions
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket585.page b/tests/FunctionalTests/tickets/protected/pages/Ticket585.page
index f5e26f24..9c02df4e 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket585.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket585.page
@@ -14,6 +14,6 @@
 	 />
 </com:TActiveCustomValidator>
 <span id="error"></span>
-<com:TButton ID="button1" Text="ok"/>
+<com:TActiveButton ID="button1" Text="ok"/>
 
 </com:TContent>
 \ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket585.php b/tests/FunctionalTests/tickets/protected/pages/Ticket585.php
index 638b7453..e5b08036 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket585.php
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket585.php
@@ -5,7 +5,7 @@ class Ticket585 extends TPage
 
 	public function ChkDate ($sender, $param)
 	{
-		if ($param->Value == "15-03-2007")
+		if ($param->Value && date('d-m-Y', $param->Value) == "15-03-2007")
 		{
 			$param->IsValid=false;
 		}