Fixed bug where contenttypedenpendecy features were ignored

sharepoint-sherpa · Sep 17, 2014 · 988b294 · 988b294
1 parent ba3d836
commit 988b294
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/Sherpa.Library/SiteHierarchy/FeatureManager.cs b/Sherpa.Library/SiteHierarchy/FeatureManager.cs
@@ -12,16 +12,30 @@ public void ActivateFeatures(ClientContext clientContext, Web webToConfigure, Li
         {
             if (siteFeatures != null)
             {
-                foreach (var featureActivation in siteFeatures.Where(f => f.ContentTypeDependency == onlyContentTypeDependencyFeatures))
+                foreach (var featureActivation in siteFeatures)
                 {
-                    ActivateSiteCollectionFeature(clientContext, featureActivation);
+                    if (onlyContentTypeDependencyFeatures && featureActivation.ContentTypeDependency)
+                    {
+                        ActivateSiteCollectionFeature(clientContext, featureActivation);
+                    }
+                    else if (!onlyContentTypeDependencyFeatures)
+                    {
+                        ActivateSiteCollectionFeature(clientContext, featureActivation);
+                    }
                 }
             }
             if (webFeatures != null)
             {
-                foreach (var featureActivation in webFeatures.Where(f => f.ContentTypeDependency == onlyContentTypeDependencyFeatures))
+                foreach (var featureActivation in webFeatures)
                 {
-                    ActivateWebFeature(clientContext, featureActivation, webToConfigure);
+                    if (onlyContentTypeDependencyFeatures && featureActivation.ContentTypeDependency)
+                    {
+                        ActivateWebFeature(clientContext, featureActivation, webToConfigure);
+                    }
+                    else if (!onlyContentTypeDependencyFeatures)
+                    {
+                        ActivateWebFeature(clientContext, featureActivation, webToConfigure);
+                    }
                 }
             }
         }