Merge Branches & Trunk

/trunk:r2680,2692,2707-2736
/branches/3.1:r2682-2686,2694-2702,2705,2738-2762

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
index 4897a146..300574aa 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.php
@@ -17,7 +17,11 @@ class ActiveDatePicker extends TPage  {
 	public function testDatePicker2($sender, $param){
 		$this->status2->Text = $this->datepicker2->getText();
 	}
-	
+
+	public function testDatePicker3($sender, $param){
+		$this->status3->Text = $this->datepicker3->getText();
+	}
+
 	public function today ($sender, $param)
 	{
 		$this->datepicker->setTimestamp(time());