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

Fixes the issue with trailing slashes and the comparison in GlobalSettings and updated unit tests

Browse Source 
to support the fix.
This commit is contained in:
Shannon Deminick
2012-09-11 05:27:39 +07:00
parent 37969909ca
commit d5ca5e32b4
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Configuration/GlobalSettings.cs
View File

@@ -834,12 +834,12 @@ namespace Umbraco.Core.Configuration
public int Compare(string part, string whole)
{
// let the default string comparer deal with null or when part is not smaller then whole
if (part == null || whole == null)
if (part == null || whole == null || part.Length >= whole.Length)
return _stringComparer.Compare(part, whole);
//trim the end '/' of each
part = part.TrimEnd('/');
whole = whole.TrimEnd('/');
//ensure both have a / on the end
part = part.EndsWith("/") ? part : part + "/";
whole = whole.EndsWith("/") ? whole : whole + "/";
if (part.Length >= whole.Length)
return _stringComparer.Compare(part, whole);