diff --git a/components/editorControls/imagecropper/DataEditor.cs b/components/editorControls/imagecropper/DataEditor.cs index 6df30d81aa..0e7e2f56cb 100644 --- a/components/editorControls/imagecropper/DataEditor.cs +++ b/components/editorControls/imagecropper/DataEditor.cs @@ -124,8 +124,6 @@ namespace umbraco.editorControls.imagecropper int xml_x2 = Convert.ToInt32(xmlNode.Attributes["x2"].Value); int xml_y2 = Convert.ToInt32(xmlNode.Attributes["y2"].Value); - DateTime fileDate = Convert.ToDateTime(_xml.DocumentElement.Attributes["date"].Value); - // only use xml values if image is the same and different from defaults (document is stored inbetween image upload and cropping) //if (xml_x2 - xml_x != preset.TargetWidth || xml_y2 - xml_y != preset.TargetHeight) //fileDate == imageInfo.DateStamp && ( diff --git a/components/editorControls/imagecropper/SaveData.cs b/components/editorControls/imagecropper/SaveData.cs index 2f047770c9..e962766b89 100644 --- a/components/editorControls/imagecropper/SaveData.cs +++ b/components/editorControls/imagecropper/SaveData.cs @@ -16,7 +16,7 @@ namespace umbraco.editorControls.imagecropper if (root == null) return null; XmlNode dateStampNode = doc.CreateNode(XmlNodeType.Attribute, "date", null); - dateStampNode.Value = imageInfo.DateStamp.ToString(); + dateStampNode.Value = imageInfo.DateStamp.ToString("s"); root.Attributes.SetNamedItem(dateStampNode); for (int i = 0; i < data.Count; i++) diff --git a/umbraco/presentation/umbraco/users/NodePermissions.ascx.cs b/umbraco/presentation/umbraco/users/NodePermissions.ascx.cs index d8e7997aea..e7b585f975 100644 --- a/umbraco/presentation/umbraco/users/NodePermissions.ascx.cs +++ b/umbraco/presentation/umbraco/users/NodePermissions.ascx.cs @@ -26,9 +26,6 @@ namespace umbraco.cms.presentation.user protected override void OnInit(EventArgs e) { base.OnInit(e); - - System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(ui.Culture(User.GetCurrent())); - System.Threading.Thread.CurrentThread.CurrentUICulture = System.Threading.Thread.CurrentThread.CurrentCulture; } protected void Page_Load(object sender, EventArgs e)