From 46de0273d5bd12b0548ffc1b3c738047bd74d47c Mon Sep 17 00:00:00 2001
From: jtkech <jean-thierry.kechichian@wanadoo.fr>
Date: Sat, 29 Aug 2015 00:27:09 +0200
Subject: [PATCH] Update CompositionStrategy.cs

---
 .../Environment/ShellBuilders/CompositionStrategy.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs b/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
index ece182b5c..08988203d 100644
--- a/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
+++ b/src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
@@ -12,6 +12,7 @@ using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Helpers;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.ShellBuilders.Models;
+using Orchard.Localization;
 using Orchard.Logging;
 
 namespace Orchard.Environment.ShellBuilders {
@@ -22,16 +23,18 @@ namespace Orchard.Environment.ShellBuilders {
             _extensionManager = extensionManager;
 
             Logger = NullLogger.Instance;
+            T = NullLocalizer.Instance;
         }
 
         public ILogger Logger { get; set; }
+        public Localizer T { get; set; }
 
         public ShellBlueprint Compose(ShellSettings settings, ShellDescriptor descriptor) {
             Logger.Debug("Composing blueprint");
 
             var builtinFeatures = BuiltinFeatures().ToList();
             var builtinFeatureDescriptors = builtinFeatures.Select(x => x.Descriptor).ToList();
-            var availableFeatures = _extensionManager.AvailableFeatures().Concat(builtinFeatureDescriptors).ToDictionary(x => x.Id);
+            var availableFeatures = _extensionManager.AvailableFeatures().Concat(builtinFeatureDescriptors).ToDictionary(x => x.Id, StringComparer.OrdinalIgnoreCase);
             var enabledFeatures = _extensionManager.EnabledFeatures(descriptor).Select(x => x.Id).ToList();
             var expandedFeatures = ExpandDependencies(availableFeatures, descriptor.Features.Select(x => x.Name)).ToList();
             var autoEnabledDependencyFeatures = expandedFeatures.Except(enabledFeatures).Except(builtinFeatureDescriptors.Select(x => x.Id)).ToList();
@@ -74,6 +77,11 @@ namespace Orchard.Environment.ShellBuilders {
 
         private IEnumerable<string> ExpandDependenciesInternal(IDictionary<string, FeatureDescriptor> availableFeatures, IEnumerable<string> features) {
             foreach (var shellFeature in features) {
+
+                if (!availableFeatures.ContainsKey(shellFeature)) {
+                    throw new OrchardException(T("The feature {0} is not available", shellFeature));
+                }
+
                 var feature = availableFeatures[shellFeature];
                 
                 foreach (var childDependency in ExpandDependenciesInternal(availableFeatures, feature.Dependencies))
@@ -199,4 +207,4 @@ namespace Orchard.Environment.ShellBuilders {
             };
         }
     }
-}
\ No newline at end of file
+}