From 6c7390a073b0d470f739c51ee5ecb28a4745b1a8 Mon Sep 17 00:00:00 2001 From: LorenzoFrediani-Laser Date: Thu, 15 Aug 2019 21:17:19 +0200 Subject: [PATCH] Change returnurl from abosuleurl to relaviveurl (#8265) --- .../Core/Contents/Views/Content.SummaryAdmin.cshtml | 2 +- .../Views/Parts.Contents.Clone.SummaryAdmin.cshtml | 2 +- .../Views/Parts.Contents.Publish.SummaryAdmin.cshtml | 6 +++--- .../Views/Parts/SpamFilter.Metadata.Actions.cshtml | 4 ++-- .../Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml | 2 +- .../Views/Content-BlogPost.SummaryAdmin.cshtml | 8 ++++---- .../Views/Parts.Blogs.BlogPost.ListAdmin.cshtml | 2 +- src/Orchard.Web/Modules/Orchard.Comments/Shapes.cs | 2 +- .../Modules/Orchard.Comments/Views/Admin/Index.cshtml | 6 +++--- .../Views/Parts.Comment.SummaryAdmin.cshtml | 4 ++-- .../Orchard.Comments/Views/Parts.CommentForm.cshtml | 2 +- .../Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml | 2 +- .../Views/EditorTemplates/Field.cshtml | 2 +- .../Modules/Orchard.CustomForms/Views/Admin/Item.cshtml | 2 +- .../Views/Content.SummaryAdminCondensed.cshtml | 2 +- .../Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml | 2 +- .../Modules/Orchard.Modules/Views/ModuleEntry.cshtml | 2 +- .../Views/GalleryUpdates/ModulesUpdates.cshtml | 2 +- .../Views/GalleryUpdates/ThemesUpdates.cshtml | 2 +- .../Modules/Orchard.Roles/Views/Admin/Index.cshtml | 2 +- .../Modules/Orchard.Tags/Views/Admin/Index.cshtml | 2 +- .../Modules/Orchard.Themes/Views/ThemeEntry.cshtml | 2 +- .../Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml | 6 +++--- src/Orchard/Environment/DefaultHostEnvironment.cs | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml index 6ee554571..c636da571 100644 --- a/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml @@ -3,7 +3,7 @@ @using Orchard.Utility.Extensions; @{ ContentItem contentItem = Model.ContentItem; - var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); + var returnUrl = ViewContext.RequestContext.HttpContext.Request.RawUrl; }
diff --git a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml index 60b3ddba4..1f3252802 100644 --- a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml @@ -5,6 +5,6 @@ ContentPart contentPart = Model.ContentPart; } @if (Authorizer.Authorize(Permissions.CreateContent, contentPart)) { - @T("Clone") + @T("Clone") @T(" | ") } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml index 45d50d104..1d20ea963 100644 --- a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml @@ -12,7 +12,7 @@ if (contentPart.HasDraft()) { if (Authorizer.Authorize(Permissions.PublishContent, contentPart)) { - @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new {area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new {area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.RawUrl}), new {itemprop = "UnsafeUrl"}) @T(" | ") } @@ -23,7 +23,7 @@ } if (Authorizer.Authorize(Permissions.PublishContent, contentPart)) { - @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new {area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new {area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.RawUrl}), new {itemprop = "UnsafeUrl"}) @T(" | ") } } else { @@ -35,7 +35,7 @@ } if (Authorizer.Authorize(Permissions.PublishContent, contentPart)) { - @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new {area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new {area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.RawUrl}), new {itemprop = "UnsafeUrl"}) @T(" | ") } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml b/src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml index 50a14b34b..02a18e9ef 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml @@ -5,10 +5,10 @@ } @if (Model.ContentPart.Status == SpamStatus.Spam) { - @Html.Link(@T("Not Spam").Text, Url.Action("ReportHam", "Admin", new {area = "Orchard.AntiSpam", part.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(@T("Not Spam").Text, Url.Action("ReportHam", "Admin", new {area = "Orchard.AntiSpam", part.Id, returnUrl = Request.RawUrl }), new {itemprop = "UnsafeUrl"}) } else { - @Html.Link(@T("Spam").Text, Url.Action("ReportSpam", "Admin", new {area = "Orchard.AntiSpam", part.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(@T("Spam").Text, Url.Action("ReportSpam", "Admin", new {area = "Orchard.AntiSpam", part.Id, returnUrl = Request.RawUrl }), new {itemprop = "UnsafeUrl"}) } @T(" | ") \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml index 4bed331b2..01a960a8e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml @@ -14,7 +14,7 @@ @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.None, T("Choose action...").ToString()) @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Remove, T("Delete").ToString()) - @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) + @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.RawUrl)
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml index 4fc4086fc..bbafab104 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml @@ -4,7 +4,7 @@ @{ Script.Require("ShapesBase"); ContentItem contentItem = Model.ContentItem; - var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); + var returnUrl = ViewContext.RequestContext.HttpContext.Request.RawUrl; }
@@ -26,7 +26,7 @@ if (contentItem.HasDraft()) { if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) { - @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) + @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.RawUrl }), new { itemprop = "UnsafeUrl" }) @T(" | ") } @@ -37,7 +37,7 @@ } if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) { - @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) + @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.RawUrl}), new { itemprop = "UnsafeUrl" }) @T(" | ") } } else { @@ -49,7 +49,7 @@ } if (Authorizer.Authorize(Orchard.Blogs.Permissions.PublishBlogPost, contentItem)) { - @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) + @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl = Request.RawUrl }), new { itemprop = "UnsafeUrl" }) @T(" | ") } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml index 7cd61b4a8..b1b8ae1d4 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml @@ -11,7 +11,7 @@ @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Unpublish, T("Unpublish").ToString()) @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Remove, T("Delete").ToString()) - @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) + @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.RawUrl)
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Comments/Shapes.cs index 38564917c..4a4b37747 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Shapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Shapes.cs @@ -34,7 +34,7 @@ namespace Orchard.Comments { Area = "Orchard.Comments", Controller = "Admin", id = item.Id, - returnUrl = Html.ViewContext.HttpContext.Request.ToUrlString() + returnUrl = Html.ViewContext.HttpContext.Request.RawUrl }); } diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml index 575bb947c..6d492c9e2 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml @@ -89,13 +89,13 @@
@if (commentEntry.Comment.Status != CommentStatus.Approved) { - @T("Approve")@T(" | ") + @T("Approve")@T(" | ") } else { - @T("Unapprove")@T(" | ") + @T("Unapprove")@T(" | ") } @T("Edit")@T(" | ") - @T("Delete") + @T("Delete")
commentIndex = commentIndex + 1; diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml index 43060eb47..70481898b 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml @@ -10,10 +10,10 @@ @if(settings.ModerateComments) { if (comment.Status != CommentStatus.Pending) { - @Html.Link(@T("Approve").Text, Url.Action("Approve", "Admin", new {area = "Orchard.Comments", comment.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(@T("Approve").Text, Url.Action("Approve", "Admin", new {area = "Orchard.Comments", comment.Id, returnUrl = Request.RawUrl }), new {itemprop = "UnsafeUrl"}) } else { - @Html.Link(@T("Unapprove").Text, Url.Action("Unapprove", "Admin", new {area = "Orchard.Comments", comment.Id, returnUrl = Request.ToUrlString()}), new {itemprop = "UnsafeUrl"}) + @Html.Link(@T("Unapprove").Text, Url.Action("Unapprove", "Admin", new {area = "Orchard.Comments", comment.Id, returnUrl = Request.RawUrl }), new {itemprop = "UnsafeUrl"}) } @T(" | ") } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml index e3460b3c1..f47bf3393 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml @@ -28,7 +28,7 @@ else if (WorkContext.CurrentUser != null && !isAuthorized) { else if (isAuthorized) { @Html.ValidationSummary() - using (Html.BeginFormAntiForgeryPost(Url.Action("Create", "Comment", new { Area = "Orchard.Comments", ReturnUrl = Context.Request.ToUrlString() }), FormMethod.Post, new { @class = "comment-form" })) { + using (Html.BeginFormAntiForgeryPost(Url.Action("Create", "Comment", new { Area = "Orchard.Comments", ReturnUrl = Context.Request.RawUrl }), FormMethod.Post, new { @class = "comment-form" })) { if (TempData.ContainsKey("Comments.InvalidCommentEditorShape")) { @Display(TempData["Comments.InvalidCommentEditorShape"]); } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml index bc0b6868a..8e8e8d6a5 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml @@ -4,7 +4,7 @@ Style.Require("ContentTypesAdmin"); Script.Require("jQuery"); Layout.Title = T("Edit Content Type - {0}", Html.Raw(Model.DisplayName)).Text; - var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); + var returnUrl = ViewContext.RequestContext.HttpContext.Request.RawUrl; }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml index db780c845..55e915462 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml @@ -1,7 +1,7 @@ @using Orchard.Utility.Extensions @model Orchard.ContentTypes.ViewModels.EditPartFieldViewModel @{ - var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); + var returnUrl = ViewContext.RequestContext.HttpContext.Request.RawUrl; }

@Model.DisplayName (@Model.FieldDefinition.Name.CamelFriendly())

diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Admin/Item.cshtml b/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Admin/Item.cshtml index 503b44d7a..82baa38c8 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Admin/Item.cshtml +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Admin/Item.cshtml @@ -15,7 +15,7 @@ @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Unpublish, T("Unpublish").ToString()) @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Remove, T("Delete").ToString()) - @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) + @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.RawUrl)
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Views/Content.SummaryAdminCondensed.cshtml b/src/Orchard.Web/Modules/Orchard.Lists/Views/Content.SummaryAdminCondensed.cshtml index ae77ddcda..0cc7217ee 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Views/Content.SummaryAdminCondensed.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Lists/Views/Content.SummaryAdminCondensed.cshtml @@ -3,7 +3,7 @@ @using Orchard.Utility.Extensions; @{ ContentItem contentItem = Model.ContentItem; - var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); + var returnUrl = ViewContext.RequestContext.HttpContext.Request.RawUrl; }
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml index bb012a146..675b2ecb9 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml @@ -8,7 +8,7 @@ string name = field.Name; var mediaParts = field.MediaParts; - var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); + var returnUrl = ViewContext.RequestContext.HttpContext.Request.RawUrl; } @displayName:

diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml index fa469f722..3e9e31bcd 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml @@ -28,7 +28,7 @@ T("Uninstall").Text, "UninstallModule", "PackagingServices", - new { ModuleId = module.Descriptor.Id, ReturnUrl = Request.ToUrlString(), Area = "Orchard.Packaging" }, + new { ModuleId = module.Descriptor.Id, ReturnUrl = Request.RawUrl, Area = "Orchard.Packaging" }, new { itemprop = "RemoveUrl UnsafeUrl" }) @if (!String.IsNullOrEmpty(module.Descriptor.Description)) { diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ModulesUpdates.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ModulesUpdates.cshtml index 0e99a9462..bf46c8191 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ModulesUpdates.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ModulesUpdates.cshtml @@ -26,7 +26,7 @@ }

- @T("Check for Updates") + @T("Check for Updates")
@if (Model.Entries.Count() <= 0) { diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ThemesUpdates.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ThemesUpdates.cshtml index af547daa9..783ff0a0a 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ThemesUpdates.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/GalleryUpdates/ThemesUpdates.cshtml @@ -26,7 +26,7 @@ }
- @T("Check for Updates") + @T("Check for Updates")
@if (Model.Entries.Count() <= 0) { diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml index 85105c7d9..379928cdf 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml @@ -39,7 +39,7 @@ @Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id }) @if (row.Name != "Administrator") { @T(" | ") - @T("Delete") + @T("Delete") } diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml index 5a677c4cf..2896a27df 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml @@ -44,7 +44,7 @@ @Html.ActionLink(T("Edit").ToString(), "Edit", new {id = tagEntry.Tag.Id}) @T(" | ") - @T("Delete") + @T("Delete") tagIndex = tagIndex + 1; diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml index f7dedda3e..7a46ef5c7 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml @@ -68,7 +68,7 @@ T("Uninstall").Text, "UninstallTheme", "PackagingServices", - new { ThemeId = theme.Descriptor.Id, ReturnUrl = Request.ToUrlString(), Area = "Orchard.Packaging" }, + new { ThemeId = theme.Descriptor.Id, ReturnUrl = Request.RawUrl, Area = "Orchard.Packaging" }, new { itemprop = "RemoveUrl UnsafeUrl" }) }
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml index 0fffc65a3..7e4a03378 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml @@ -31,19 +31,19 @@ @if (widget.HasPublished()) { if (widget.HasDraft()) { if (Authorizer.Authorize(Permissions.PublishContent, widget)) { - @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) + @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.RawUrl }), new { itemprop = "UnsafeUrl" }) @T(" | ") } } if (Authorizer.Authorize(Permissions.PublishContent, widget)) { - @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) + @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.RawUrl }), new { itemprop = "UnsafeUrl" }) @T(" | ") } } else { if (Authorizer.Authorize(Permissions.PublishContent, widget)) { - @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) + @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = widget.ContentItem.Id, returnUrl = Request.RawUrl }), new { itemprop = "UnsafeUrl" }) @T(" | ") } } diff --git a/src/Orchard/Environment/DefaultHostEnvironment.cs b/src/Orchard/Environment/DefaultHostEnvironment.cs index df87eeed6..a5c4db6d2 100644 --- a/src/Orchard/Environment/DefaultHostEnvironment.cs +++ b/src/Orchard/Environment/DefaultHostEnvironment.cs @@ -45,7 +45,7 @@ namespace Orchard.Environment { if (!httpContext.IsBackgroundContext()) { // Don't redirect posts... if (httpContext.Request.RequestType == "GET") { - httpContext.Response.Redirect(HttpContext.Current.Request.ToUrlString(), true /*endResponse*/); + httpContext.Response.Redirect(HttpContext.Current.Request.RawUrl, true /*endResponse*/); } else { httpContext.Response.ContentType = "text/html";