lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing issue with fetching a theme and rendering shapes from a background thread.

Browse Source
This commit is contained in:
Piotr Szmyd
2016-01-16 00:13:24 +01:00
parent eb7574df0b
commit 7057740787
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -399,7 +399,8 @@ namespace Orchard.Core.Shapes {
break;
default:
Debug.Assert(site.ResourceDebugMode == ResourceDebugMode.FromAppSetting, "Unknown ResourceDebugMode value.");
debugMode = _httpContextAccessor.Value.Current().IsDebuggingEnabled;
var context = _httpContextAccessor.Value.Current();
debugMode = context != null && context.IsDebuggingEnabled;
break;
}
var defaultSettings = new RequireSettings {
@@ -408,7 +409,11 @@ namespace Orchard.Core.Shapes {
Culture = _workContext.Value.CurrentCulture,
};
var requiredResources = _resourceManager.Value.BuildRequiredResources(resourceType);
var appPath = _httpContextAccessor.Value.Current().Request.ApplicationPath;
var httpContext = _httpContextAccessor.Value.Current();
var appPath = httpContext == null || httpContext.Request == null
? null
: httpContext.Request.ApplicationPath;
foreach (var context in requiredResources.Where(r =>
(includeLocation.HasValue ? r.Settings.Location == includeLocation.Value : true) &&
(excludeLocation.HasValue ? r.Settings.Location != excludeLocation.Value : true))) {

10
src/Orchard/Themes/CurrentThemeWorkContext.cs
View File

@@ -1,5 +1,6 @@
using System;
using Orchard.Mvc;
using Orchard.Mvc.Extensions;
namespace Orchard.Themes
{
@@ -16,9 +17,12 @@ namespace Orchard.Themes
public Func<WorkContext, T> Get<T>(string name)
{
if (name == "CurrentTheme")
{
var currentTheme = _themeManager.GetRequestTheme(_httpContextAccessor.Current().Request.RequestContext);
if (name == "CurrentTheme") {
var context = _httpContextAccessor.Current();
var currentTheme = context != null && context.Request != null
? _themeManager.GetRequestTheme(context.Request.RequestContext)
: null;
return ctx => (T)(object)currentTheme;
}
return null;

4
src/Orchard/UI/Resources/ResourceDefinition.cs
View File

@@ -204,7 +204,9 @@ namespace Orchard.UI.Resources {
url = VirtualPathUtility.Combine(BasePath, url);
}
if (VirtualPathUtility.IsAppRelative(url)) {
url = VirtualPathUtility.ToAbsolute(url, applicationPath);
url = applicationPath != null
? VirtualPathUtility.ToAbsolute(url, applicationPath)
: VirtualPathUtility.ToAbsolute(url);
}
_urlResolveCache[settings] = url;
return url;