From 8313b3412e0db7262966a60b859093e6577abb46 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 17 Jul 2007 11:27:51 +0000
Subject: Fixed #670.

---
 framework/PradoBase.php                                         | 2 +-
 framework/Web/Javascripts/source/prado/datepicker/datepicker.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework')

diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index f8d8ec81..9f6d91a0 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -66,7 +66,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.1.0';
+		return '3.1.1';
 	}
 
 	/**
diff --git a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
index 6dddeaad..ade26d26 100644
--- a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
@@ -473,7 +473,7 @@ Prado.WebUI.TDatePicker.prototype =
 			date = new Date();
 		if(typeof(date) == "string" || typeof(date) == "number")
 			date = new Date(date);
-		return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0,0,0);
+		return new Date(Math.min(Math.max(date.getFullYear(),this.FromYear),this.UpToYear), date.getMonth(), date.getDate(), 0,0,0);
 	},
 
 	setSelectedDate : function(date)
-- 
cgit v1.2.3