mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
- Fixing build break due to missing file.
- Code convention enforcement to previous contribution.
This commit is contained in:
@@ -1,20 +1,16 @@
|
||||
using System;
|
||||
using System.Web.Mvc;
|
||||
using Orchard.Mvc.Results;
|
||||
|
||||
namespace Orchard.Mvc.Extensions {
|
||||
public static class ControllerExtensions {
|
||||
public static RedirectResult ReturnUrlRedirect(this Controller controller) {
|
||||
var request = controller.HttpContext.Request;
|
||||
Uri returnUrl = null;
|
||||
try
|
||||
{
|
||||
try {
|
||||
returnUrl = new Uri(request.QueryString["ReturnUrl"]);
|
||||
}
|
||||
catch
|
||||
{
|
||||
try
|
||||
{
|
||||
catch {
|
||||
try {
|
||||
returnUrl =
|
||||
new Uri(string.Format("{0}://{1}{2}{3}", request.Url.Scheme, request.Url.Host,
|
||||
request.Url.Port != 80 ? ":" + request.Url.Port : "",
|
||||
@@ -26,14 +22,10 @@ namespace Orchard.Mvc.Extensions {
|
||||
if (returnUrl != null &&
|
||||
returnUrl.Scheme == request.Url.Scheme &&
|
||||
returnUrl.Port == request.Url.Port &&
|
||||
returnUrl.Host == request.Url.Host)
|
||||
{
|
||||
returnUrl.Host == request.Url.Host) {
|
||||
return new RedirectResult(returnUrl.ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
return new RedirectResult("~/");
|
||||
}
|
||||
return new RedirectResult("~/");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,6 @@
|
||||
<Compile Include="Storage\IStorageFolder.cs" />
|
||||
<Compile Include="Storage\IStorageProvider.cs" />
|
||||
<Compile Include="UI\Zones\ZoneManager.cs" />
|
||||
<Compile Include="Utility\FollowReturnUrl.cs" />
|
||||
<Compile Include="Utility\Position.cs" />
|
||||
<Compile Include="Utility\Reflect.cs" />
|
||||
<Compile Include="Utility\ReflectOn.cs" />
|
||||
|
||||
Reference in New Issue
Block a user