lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros 2014-04-19 15:20:07 -07:00
commit 43712d396c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Modules/Orchard.Blogs/Routing/ArchiveConstraint.CS
View File

@ -59,12 +59,12 @@ namespace Orchard.Blogs.Routing {
public string FindPath(string path) {
// my-blog/archive
if (path.EndsWith("/archive")) {
if (path.EndsWith("/archive", StringComparison.OrdinalIgnoreCase)) {
return path.Substring(0, path.Length - "/archive".Length);
}
// my-blog/archive/
if (path.EndsWith("/archive/")) {
if (path.EndsWith("/archive/", StringComparison.OrdinalIgnoreCase)) {
return null;
}
@ -74,12 +74,12 @@ namespace Orchard.Blogs.Routing {
if (archiveIndex == -1) {
// archive/
if (path.EndsWith("archive/")) {
if (path.EndsWith("archive/", StringComparison.OrdinalIgnoreCase)) {
return null;
}
// archive
if (path.EndsWith("archive")) {
if (path.EndsWith("archive", StringComparison.OrdinalIgnoreCase)) {
return String.Empty;
}
@ -96,12 +96,12 @@ namespace Orchard.Blogs.Routing {
public ArchiveData FindArchiveData(string path) {
// my-blog/archive
if (path.EndsWith("/archive")) {
if (path.EndsWith("/archive", StringComparison.OrdinalIgnoreCase)) {
return new ArchiveData("");
}
// my-blog/archive/
if (path.EndsWith("/archive/")) {
if (path.EndsWith("/archive/", StringComparison.OrdinalIgnoreCase)) {
return null;
}
@ -110,12 +110,12 @@ namespace Orchard.Blogs.Routing {
if (archiveIndex == -1) {
// archive/
if (path.EndsWith("archive/")) {
if (path.EndsWith("archive/", StringComparison.OrdinalIgnoreCase)) {
return null;
}
// archive
if (path.EndsWith("archive")) {
if (path.EndsWith("archive", StringComparison.OrdinalIgnoreCase)) {
return new ArchiveData("");
}