From 5517a29d473ec66553bc945962c657d3c669661b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 13 Sep 2013 13:06:46 +0000
Subject: [PATCH] Fix datepicker error,"hour is undefined" from et2_widget_date

---
 etemplate/js/et2_widget_date.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js
index 9768d90947..a0b887cd9f 100644
--- a/etemplate/js/et2_widget_date.js
+++ b/etemplate/js/et2_widget_date.js
@@ -104,7 +104,7 @@ var et2_date = et2_inputWidget.extend(
 				d.setHours(inst.hour);
 				d.setMinutes(inst.minute);
 			}
-			else if(inst && (typeof inst.hour === 'undefined'))
+			else if(inst && (typeof inst.hour === 'undefined') && (typeof inst.settings.timepicker !== 'undefined'))
 			{
 				d.setHours(inst.settings.timepicker.hour);
 				d.setMinutes(inst.settings.timepicker.minute);