Fixing NRE when area is not set

OrchardCMS · Oct 3, 2017 · e54c931 · e54c931
1 parent 6bfd95b
commit e54c931
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.../OrchardCore.DisplayManagement/LocationExpander/ThemeAwareViewLocationExpanderProvider.cs b/.../OrchardCore.DisplayManagement/LocationExpander/ThemeAwareViewLocationExpanderProvider.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Razor;
@@ -84,13 +85,16 @@ IEnumerable<string> PageViewLocations()
 
             var result = new List<string>();
 
-            foreach (var theme in currentThemeAndBaseThemesOrdered)
+            if (!String.IsNullOrEmpty(context.AreaName))
             {
-                if (context.AreaName != theme.Id)
+                foreach (var theme in currentThemeAndBaseThemesOrdered)
                 {
-                    var themeViewsPath = '/' + theme.Extension.SubPath + "/Views/" + context.AreaName;
-                    result.Add(themeViewsPath + "/{1}/{0}" + RazorViewEngine.ViewExtension);
-                    result.Add(themeViewsPath + "/Shared/{0}" + RazorViewEngine.ViewExtension);
+                    if (context.AreaName != theme.Id)
+                    {
+                        var themeViewsPath = '/' + theme.Extension.SubPath + "/Views/" + context.AreaName;
+                        result.Add(themeViewsPath + "/{1}/{0}" + RazorViewEngine.ViewExtension);
+                        result.Add(themeViewsPath + "/Shared/{0}" + RazorViewEngine.ViewExtension);
+                    }
                 }
             }
 

diff --git a/src/OrchardCore/OrchardCore.Environment.Extensions/ExtensionManager.cs b/src/OrchardCore/OrchardCore.Environment.Extensions/ExtensionManager.cs
@@ -93,7 +93,7 @@ public IExtensionInfo GetExtension(string extensionId)
             EnsureInitialized();
 
             ExtensionEntry extension;
-            if (_extensions.TryGetValue(extensionId, out extension))
+            if (!String.IsNullOrEmpty(extensionId) && _extensions.TryGetValue(extensionId, out extension))
             {
                 return extension.ExtensionInfo;
             }