lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Roles/Module.txt
This commit is contained in:
Sebastien Ros
2014-05-02 09:36:18 -07:00
parent 378f57601e dd1842bb13
commit 59a2d037a9
3 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CREDITS.txt
View File

@@ -142,16 +142,28 @@ Website: http://www.jacklmoore.com/colorbox/
Copyright: (c) 2013 Jack Moore - jacklmoore.com/colorbox
License: MIT
jQuery File Upload
-----
Website: https://blueimp.net
Copyright: Copyright 2010, Sebastian Tschan
License MIT
jQuery UI (Core, Widget, Datepicker)
-----
Website: http://docs.jquery.com/UI
Copyright: Copyright (c) 2010 lib/jquery.ui/AUTHORS.txt (http://jqueryui.com/about)
License: MIT
jQuery ui.timepickr, jQuery utils
jQuery Calendar
-----
Website: http://code.google.com/p/jquery-utils/
Copyright: Copyright (c) Maxime Haineault (http://haineault.com)
Website: http://keith-wood.name/calendars.html
Author: Keith Wood
License: MIT
jQuery Date/Time Entry
-----
Website: http://keith-wood.name/datetimeEntry.html
Copyright: Keith Wood
License: MIT
jQuery ScrollTo
@@ -215,6 +227,12 @@ Website: http://code.google.com/p/nhlambdaextensions/
Copyright: Unknown http://code.google.com/p/nhlambdaextensions/people/list
License: LGPL 2.1
NProgress
-----
Website: http://ricostacruz.com/nprogress/
Copyright: Copyright (c) 2013-2014 Rico Sta. Cruz
License: MIT
NuGet
-----
Website: http://nuget.codeplex.com

26
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
View File

@@ -314,14 +314,30 @@ namespace Orchard.OutputCache.Filters {
_filter = null;
if (_previousFilter != null) {
response.Filter = _previousFilter;
}
}
// if the result of a POST is a Redirect, remove any Cache Item for this url
// so that the redirected client gets a fresh result
// i.e., Comment creation
if (filterContext.HttpContext.Request.HttpMethod.Equals("POST", StringComparison.OrdinalIgnoreCase) &&
!String.IsNullOrWhiteSpace(filterContext.HttpContext.Response.RedirectLocation)) {
var url = filterContext.HttpContext.Response.RedirectLocation;
if (!VirtualPathUtility.IsAbsolute(url)) {
var applicationRoot = new UrlHelper(filterContext.HttpContext.Request.RequestContext).MakeAbsolute("/");
if (url.StartsWith(applicationRoot, StringComparison.OrdinalIgnoreCase)) {
url = url.Substring(applicationRoot.Length);
}
}
var redirectionInvariantCacheKey = ComputeCacheKey(_shellSettings.Name, url, () => _workContext.CurrentCulture, _themeManager.GetRequestTheme(filterContext.RequestContext).Id, null);
_cacheService.RemoveByTag(redirectionInvariantCacheKey);
}
return;
}
// if the result of a POST is a Redirect, remove any Cache Item for this url
// so that the redirected client gets a fresh result
// also add a random token to the query string so that public cachers (IIS, proxies, ...) don't return cached content
// i.e., Comment creation
// ignore in admin
if (AdminFilter.IsApplied(new RequestContext(filterContext.HttpContext, new RouteData()))) {

4
src/Orchard.Web/Modules/Orchard.Roles/Module.txt
View File

@@ -4,7 +4,7 @@ Author: The Orchard Team
Website: http://orchardproject.net
Version: 1.8
OrchardVersion: 1.8
Description: Provides anti-spam services to protect your content from malicious submissions.
Description: The roles module is adding the ability to assign roles to users. It's also providing a set of default roles for which other modules can define default permissions.
Features:
Orchard.Roles:
Name: Roles
@@ -13,6 +13,6 @@ Features:
Dependencies: Orchard.Users
Orchard.Roles.Workflows:
Name: Roles Workflows Activities
Description: Provides an role based activities.
Description: Provides a role based activities.
Category: Workflows
Dependencies: Orchard.Roles, Orchard.Workflows