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

Merge remote-tracking branch 'origin/dev-v7' into 7.4.0

Browse Source
This commit is contained in:
Shannon
2016-01-06 12:01:12 +01:00
parent a2b0f6f7f9 58c30cd7a6
commit 4838bf62f7
7 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Media/Exif/ExifPropertyCollection.cs
View File

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

2
src/Umbraco.Core/Services/MemberService.cs
View File

@@ -111,7 +111,7 @@ namespace Umbraco.Core.Services
member.RawPasswordValue = result.RawPasswordValue;
member.LastPasswordChangeDate = result.LastPasswordChangeDate;
member.UpdateDate = member.UpdateDate;
member.UpdateDate = result.UpdateDate;
}
/// <summary>

2
src/Umbraco.Core/Services/UserService.cs
View File

@@ -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;
}
}

2
src/Umbraco.Tests/UriExtensionsTests.cs
View File

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

2
src/Umbraco.Web/Models/ImageCropDataSet.cs
View File

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

2
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
View File

@@ -500,7 +500,7 @@ namespace umbraco.cms.presentation.Trees
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
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);

7
src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
View File

@@ -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 += ",";