mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-09-19 10:07:55 +08:00
Medium Trust: Updating Clay to not use diagnostics trace which requires permissions not available under medium trust. Removing some dead code.
--HG-- branch : dev
This commit is contained in:
Binary file not shown.
@@ -1,16 +1,11 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Web.Routing;
|
using System.Web.Routing;
|
||||||
using ClaySharp;
|
|
||||||
using ClaySharp.Implementation;
|
using ClaySharp.Implementation;
|
||||||
using Microsoft.CSharp.RuntimeBinder;
|
|
||||||
using Orchard.ContentManagement.Handlers;
|
using Orchard.ContentManagement.Handlers;
|
||||||
using Orchard.DisplayManagement;
|
using Orchard.DisplayManagement;
|
||||||
using Orchard.DisplayManagement.Descriptors;
|
using Orchard.DisplayManagement.Descriptors;
|
||||||
using Orchard.Logging;
|
using Orchard.Logging;
|
||||||
using Orchard.Mvc;
|
|
||||||
using Orchard.Themes;
|
using Orchard.Themes;
|
||||||
using Orchard.UI.Zones;
|
using Orchard.UI.Zones;
|
||||||
|
|
||||||
@@ -19,8 +14,6 @@ namespace Orchard.ContentManagement {
|
|||||||
private readonly Lazy<IEnumerable<IContentHandler>> _handlers;
|
private readonly Lazy<IEnumerable<IContentHandler>> _handlers;
|
||||||
private readonly IShapeFactory _shapeFactory;
|
private readonly IShapeFactory _shapeFactory;
|
||||||
private readonly IShapeTableManager _shapeTableManager;
|
private readonly IShapeTableManager _shapeTableManager;
|
||||||
private readonly IWorkContextAccessor _workContextAccessor;
|
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
|
||||||
private readonly Lazy<IThemeService> _themeService;
|
private readonly Lazy<IThemeService> _themeService;
|
||||||
private readonly RequestContext _requestContext;
|
private readonly RequestContext _requestContext;
|
||||||
|
|
||||||
@@ -28,15 +21,11 @@ namespace Orchard.ContentManagement {
|
|||||||
Lazy<IEnumerable<IContentHandler>> handlers,
|
Lazy<IEnumerable<IContentHandler>> handlers,
|
||||||
IShapeFactory shapeFactory,
|
IShapeFactory shapeFactory,
|
||||||
IShapeTableManager shapeTableManager,
|
IShapeTableManager shapeTableManager,
|
||||||
IWorkContextAccessor workContextAccessor,
|
|
||||||
IHttpContextAccessor httpContextAccessor,
|
|
||||||
Lazy<IThemeService> themeService,
|
Lazy<IThemeService> themeService,
|
||||||
RequestContext requestContext) {
|
RequestContext requestContext) {
|
||||||
_handlers = handlers;
|
_handlers = handlers;
|
||||||
_shapeFactory = shapeFactory;
|
_shapeFactory = shapeFactory;
|
||||||
_shapeTableManager = shapeTableManager;
|
_shapeTableManager = shapeTableManager;
|
||||||
_workContextAccessor = workContextAccessor;
|
|
||||||
_httpContextAccessor = httpContextAccessor;
|
|
||||||
_themeService = themeService;
|
_themeService = themeService;
|
||||||
_requestContext = requestContext;
|
_requestContext = requestContext;
|
||||||
Logger = NullLogger.Instance;
|
Logger = NullLogger.Instance;
|
||||||
@@ -44,14 +33,6 @@ namespace Orchard.ContentManagement {
|
|||||||
|
|
||||||
public ILogger Logger { get; set; }
|
public ILogger Logger { get; set; }
|
||||||
|
|
||||||
static readonly CallSiteCollection _shapeHelperCalls = new CallSiteCollection(shapeTypeName => Binder.InvokeMember(
|
|
||||||
CSharpBinderFlags.None,
|
|
||||||
shapeTypeName,
|
|
||||||
Enumerable.Empty<Type>(),
|
|
||||||
null,
|
|
||||||
new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) }));
|
|
||||||
|
|
||||||
|
|
||||||
public dynamic BuildDisplay(IContent content, string displayType) {
|
public dynamic BuildDisplay(IContent content, string displayType) {
|
||||||
var contentTypeDefinition = content.ContentItem.TypeDefinition;
|
var contentTypeDefinition = content.ContentItem.TypeDefinition;
|
||||||
string stereotype;
|
string stereotype;
|
||||||
|
Reference in New Issue
Block a user