diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexService.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexService.cs index aad07cd8d..bfd5446b0 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexService.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexService.cs @@ -38,7 +38,7 @@ namespace Orchard.Indexing.Services UpdateIndex(indexName); } else { - Services.Notifier.Warning(T("The index {0} could no ben rebuilt. It might already be in use, please try again later.", indexName)); + Services.Notifier.Warning(T("The index {0} could not be rebuilt. It might already be in use, please try again later.", indexName)); } } diff --git a/src/Orchard/UI/Navigation/MenuItemComparer.cs b/src/Orchard/UI/Navigation/MenuItemComparer.cs index 81124f090..bc996b1aa 100644 --- a/src/Orchard/UI/Navigation/MenuItemComparer.cs +++ b/src/Orchard/UI/Navigation/MenuItemComparer.cs @@ -36,6 +36,18 @@ namespace Orchard.UI.Navigation { return false; } + if (!string.IsNullOrWhiteSpace(x.Position) && !string.IsNullOrWhiteSpace(y.Position)) { + var xPosSplitted = x.Position.Split('.').Where(ss => ss != "0").ToArray(); + var yPosSplitted = y.Position.Split('.').Where(ss => ss != "0").ToArray(); + var xParentPosition = xPosSplitted.Length > 0 ? string.Join(".", xPosSplitted.Take(xPosSplitted.Length - 1)) : null; + var yParentPosition = yPosSplitted.Length > 0 ? string.Join(".", yPosSplitted.Take(yPosSplitted.Length - 1)) : null; + + if (!string.Equals(xParentPosition, yParentPosition)) + { + return false; + } + } + return true; }