diff --git a/src/org/opencms/workplace/commons/CmsPublishScheduled.java b/src/org/opencms/workplace/commons/CmsPublishScheduled.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/workplace/commons/CmsPublishScheduled.java
+++ b/src/org/opencms/workplace/commons/CmsPublishScheduled.java
@@ -263,8 +263,11 @@ public class CmsPublishScheduled extends CmsDialog {
         String userName = getCms().getRequestContext().getCurrentUser().getName();
 
         // get the java date format
-        DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, getLocale());
-        Date date = dateFormat.parse(publishScheduledDate);
+        //        DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, getLocale());
+        //        dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        //        Date date = dateFormat.parse(publishScheduledDate);
+        long lDate = org.opencms.widgets.CmsCalendarWidget.getCalendarDate(getMessages(), publishScheduledDate, true);
+        Date date = new Date(lDate);
 
         // check if the selected date is in the future
         if (date.getTime() < new Date().getTime()) {
Improved date handling in CmsPublishScheduled (orginally commited by
sschneider in branch 9_0_0_solr, commit
<I>de5a3bdaf<I>cd<I>bb7b<I>cfc<I>c<I>)