yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work items: 30273

Browse Source
This commit is contained in:
hartvig
2011-12-22 10:20:17 -01:00
parent b0f0777952
commit ea0ffc8ea5
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/editorControls/imagecropper/DataEditor.cs
View File

@@ -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 && (

2
components/editorControls/imagecropper/SaveData.cs
View File

@@ -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++)

3
umbraco/presentation/umbraco/users/NodePermissions.ascx.cs
View File

@@ -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)