From f4e29d90e04bba51be7bb9112e02c179d806908a Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 5 Jan 2016 23:12:09 +0100 Subject: [PATCH 1/7] Code sample No.1 --- src/Umbraco.Web/Models/ImageCropDataSet.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/ImageCropDataSet.cs b/src/Umbraco.Web/Models/ImageCropDataSet.cs index b3b584682a..22ff136c6b 100644 --- a/src/Umbraco.Web/Models/ImageCropDataSet.cs +++ b/src/Umbraco.Web/Models/ImageCropDataSet.cs @@ -55,7 +55,7 @@ namespace Umbraco.Web.Models public bool HasFocalPoint() { - return FocalPoint != null && FocalPoint.Top != 0.5m && FocalPoint.Top != 0.5m; + return FocalPoint != null && FocalPoint.Left != 0.5m && FocalPoint.Top != 0.5m; } public bool HasCrop(string alias) From f68b2de9e340297c3782ed8a47497919c01e049c Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 5 Jan 2016 23:13:37 +0100 Subject: [PATCH 2/7] Code sample No.2 --- src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs index 5abe5dee1c..49d8c7214d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs @@ -500,7 +500,7 @@ namespace umbraco.cms.presentation.Trees /// The instance containing the event data. protected virtual void OnBeforeNodeRender(ref XmlTree sender, ref XmlTreeNode node, EventArgs e) { - if (node != null && node != null) + if (sender != null && node != null) { if (BeforeNodeRender != null) BeforeNodeRender(ref sender, ref node, e); From 8afc4f5ad13e9d20f9412c808834bf26f460bc04 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 5 Jan 2016 23:15:25 +0100 Subject: [PATCH 3/7] Code sample No.3 --- src/Umbraco.Core/Media/Exif/ExifPropertyCollection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Media/Exif/ExifPropertyCollection.cs b/src/Umbraco.Core/Media/Exif/ExifPropertyCollection.cs index 452c05adb8..1be504ea45 100644 --- a/src/Umbraco.Core/Media/Exif/ExifPropertyCollection.cs +++ b/src/Umbraco.Core/Media/Exif/ExifPropertyCollection.cs @@ -75,7 +75,7 @@ namespace Umbraco.Core.Media.Exif { if (items.ContainsKey (key)) items.Remove (key); - if (key == ExifTag.WindowsTitle || key == ExifTag.WindowsTitle || key == ExifTag.WindowsComment || key == ExifTag.WindowsAuthor || key == ExifTag.WindowsKeywords || key == ExifTag.WindowsSubject) { + if (key == ExifTag.WindowsTitle || key == ExifTag.WindowsComment || key == ExifTag.WindowsAuthor || key == ExifTag.WindowsKeywords || key == ExifTag.WindowsSubject) { items.Add (key, new WindowsByteString (key, value)); } else { items.Add (key, new ExifAscii (key, value, parent.Encoding)); From b94c396d4e796f776da7a10dbf2bf7e0ffd90481 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 5 Jan 2016 23:20:47 +0100 Subject: [PATCH 4/7] Code sample No.5 --- src/umbraco.editorControls/tinyMCE3/TinyMCE.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs index f8de39e536..fcae44b113 100644 --- a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs +++ b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs @@ -164,13 +164,8 @@ namespace umbraco.editorControls.tinyMCE3 foreach (StylesheetProperty p in s.Properties) { if (styles != string.Empty) - { styles += ";"; - } - if (p.Alias.StartsWith(".")) - styles += p.Text + "=" + p.Alias; - else - styles += p.Text + "=" + p.Alias; + styles += p.Text + "=" + p.Alias; } cssFiles += ","; From a15b005d95c52b33871425ceda791098bba797db Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 5 Jan 2016 23:22:16 +0100 Subject: [PATCH 5/7] Code sample No.6, No.7 --- src/Umbraco.Core/Services/MemberService.cs | 2 +- src/Umbraco.Core/Services/UserService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs index fdfe401ca9..4f0647dbf7 100644 --- a/src/Umbraco.Core/Services/MemberService.cs +++ b/src/Umbraco.Core/Services/MemberService.cs @@ -111,7 +111,7 @@ namespace Umbraco.Core.Services member.RawPasswordValue = result.RawPasswordValue; member.LastPasswordChangeDate = result.LastPasswordChangeDate; - member.UpdateDate = member.UpdateDate; + member.UpdateDate = result.UpdateDate; } /// diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs index 55d7dd9742..c7a63a884b 100644 --- a/src/Umbraco.Core/Services/UserService.cs +++ b/src/Umbraco.Core/Services/UserService.cs @@ -266,7 +266,7 @@ namespace Umbraco.Core.Services //should never be null but it could have been deleted by another thread. user.RawPasswordValue = result.RawPasswordValue; user.LastPasswordChangeDate = result.LastPasswordChangeDate; - user.UpdateDate = user.UpdateDate; + user.UpdateDate = result.UpdateDate; } } From 59fe690a884a2c97785402a9ec1a38c5f652b5bf Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 5 Jan 2016 23:34:30 +0100 Subject: [PATCH 6/7] Code sample No.10 --- src/Umbraco.Tests/UriExtensionsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/UriExtensionsTests.cs b/src/Umbraco.Tests/UriExtensionsTests.cs index 4ea8e8875a..91f727f5f9 100644 --- a/src/Umbraco.Tests/UriExtensionsTests.cs +++ b/src/Umbraco.Tests/UriExtensionsTests.cs @@ -141,7 +141,7 @@ namespace Umbraco.Tests public void GetAbsolutePathDecoded(string input, string expected) { var source = new Uri(input, UriKind.RelativeOrAbsolute); - var output = source.GetSafeAbsolutePathDecoded(); + var output = source.GetAbsolutePathDecoded(); Assert.AreEqual(expected, output); } From 58c30cd7a6a96519c8c2277a34cb63641cd714e9 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 6 Jan 2016 12:00:50 +0100 Subject: [PATCH 7/7] removes erroneous reverse call --- src/umbraco.cms/helpers/DeepLink.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/umbraco.cms/helpers/DeepLink.cs b/src/umbraco.cms/helpers/DeepLink.cs index 595647c612..9c401ea87a 100644 --- a/src/umbraco.cms/helpers/DeepLink.cs +++ b/src/umbraco.cms/helpers/DeepLink.cs @@ -16,7 +16,7 @@ namespace umbraco.cms.helpers treePath.Add("-1"); treePath.Add("init"); string[] pathPaths = filePath.Split('/'); - pathPaths.Reverse(); + for (int p = 0; p < pathPaths.Length; p++) { treePath.Add(string.Join("/", pathPaths.Take(p + 1).ToArray()));