Fixes: U4-3894 Date picker with time resets to "måndag januari 1, 0001" on Republish entire site

Shazwazza · Shazwazza · commit 2f7727af689a · 2014-01-29T11:20:25.000+11:00
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
@@ -26,13 +26,14 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o
             if (source == null) return DateTime.MinValue;
 
             // in XML a DateTime is: string - format "yyyy-MM-ddTHH:mm:ss"
+            // Actually, not always sometimes it is formatted in UTC style with 'Z' suffixed on the end but that is due to this bug:
+            // http://issues.umbraco.org/issue/U4-4145, http://issues.umbraco.org/issue/U4-3894
+            // We should just be using TryConvertTo instead.
             var sourceString = source as string;
             if (sourceString != null)
             {
-                DateTime value;
-                return DateTime.TryParseExact(sourceString, "yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out value) 
-                    ? value 
-                    : DateTime.MinValue;
+                var attempt = sourceString.TryConvertTo<DateTime>();
+                return attempt.Success == false ? DateTime.MinValue : attempt.Result;
             }
 
             // in the database a DateTime is: DateTime
@@ -47,7 +48,7 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o
         public override object ConvertSourceToXPath(PublishedPropertyType propertyType, object source, bool preview)
         {
             // source should come from ConvertSource and be a DateTime already
-            return XmlConvert.ToString((DateTime) source, "yyyy-MM-ddTHH:mm:ss");
+            return XmlConvert.ToString((DateTime)source, XmlDateTimeSerializationMode.Unspecified);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,14 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o`
`26`	`26`	`if (source == null) return DateTime.MinValue;`
`27`	`27`
`28`	`28`	`// in XML a DateTime is: string - format "yyyy-MM-ddTHH:mm:ss"`
	`29`	`+ // Actually, not always sometimes it is formatted in UTC style with 'Z' suffixed on the end but that is due to this bug:`
	`30`	`+ // http://issues.umbraco.org/issue/U4-4145, http://issues.umbraco.org/issue/U4-3894`
	`31`	`+ // We should just be using TryConvertTo instead.`
`29`	`32`	`var sourceString = source as string;`
`30`	`33`	`if (sourceString != null)`
`31`	`34`	`{`
`32`		`- DateTime value;`
`33`		`- return DateTime.TryParseExact(sourceString, "yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out value)`
`34`		`- ? value`
`35`		`- : DateTime.MinValue;`
	`35`	`+ var attempt = sourceString.TryConvertTo<DateTime>();`
	`36`	`+ return attempt.Success == false ? DateTime.MinValue : attempt.Result;`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`// in the database a DateTime is: DateTime`
`@@ -47,7 +48,7 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o`
`47`	`48`	`public override object ConvertSourceToXPath(PublishedPropertyType propertyType, object source, bool preview)`
`48`	`49`	`{`
`49`	`50`	`// source should come from ConvertSource and be a DateTime already`
`50`		`- return XmlConvert.ToString((DateTime) source, "yyyy-MM-ddTHH:mm:ss");`
	`51`	`+ return XmlConvert.ToString((DateTime)source, XmlDateTimeSerializationMode.Unspecified);`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`}`