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
This commit is contained in:
Sebastien Ros
2014-05-28 10:19:06 -07:00
parent d5221d0444 c4b4f1593f
commit 454495445d
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Containers/Drivers/ContainablePartDriver.cs
View File

@@ -37,7 +37,8 @@ namespace Orchard.Core.Containers.Drivers {
var commonPart = part.As<CommonPart>();
var model = new ContainableViewModel {
ShowContainerPicker = settings.ShowContainerPicker,
ShowPositionEditor = settings.ShowPositionEditor
ShowPositionEditor = settings.ShowPositionEditor,
Position = part.Position
};
if (commonPart != null && commonPart.Container != null) {

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

@@ -291,9 +291,9 @@ namespace Orchard.OutputCache.Filters {
// get contents
ApplyCacheControl(_cacheItem, response);
// no cache content available, intercept the execution results for caching
_cachingWriter = new StringWriter(CultureInfo.InvariantCulture);
// no cache content available, intercept the execution results for caching, using the targetted encoding
_originalWriter = filterContext.HttpContext.Response.Output;
_cachingWriter = new StringWriterWithEncoding(_originalWriter.Encoding, _originalWriter.FormatProvider);
filterContext.HttpContext.Response.Output = _cachingWriter;
_completeResponse = CaptureResponse;
@@ -389,6 +389,8 @@ namespace Orchard.OutputCache.Filters {
filterContext.HttpContext.Response.Output = _originalWriter;
string capturedText = _cachingWriter.ToString();
_cachingWriter.Dispose();
filterContext.HttpContext.Response.Write(capturedText);
return capturedText;
}
@@ -604,4 +606,16 @@ namespace Orchard.OutputCache.Filters {
public ViewDataDictionary ViewData { get; set; }
}
public sealed class StringWriterWithEncoding : StringWriter {
private readonly Encoding encoding;
public StringWriterWithEncoding(Encoding encoding, IFormatProvider formatProvider)
: base(formatProvider) {
this.encoding = encoding;
}
public override Encoding Encoding {
get { return encoding; }
}
}
}