From 3c03ef57067aaea6aec5b1a18295ac601b26d5b9 Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Wed, 16 Dec 2009 21:37:05 +0000
Subject: [PATCH] Keeping the view engine collection from growing on each
 request

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044174
---
 src/Orchard/Environment/OrchardStarter.cs                 | 2 +-
 src/Orchard/Mvc/Html/LayoutHelperExtensions.cs            | 2 ++
 src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs           | 3 +--
 src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs
index 4f5337023..55828a9db 100644
--- a/src/Orchard/Environment/OrchardStarter.cs
+++ b/src/Orchard/Environment/OrchardStarter.cs
@@ -38,7 +38,7 @@ namespace Orchard.Environment {
                 .WithArguments(new NamedParameter("paths", new[] { "~/Core", "~/Packages" }))
                 .SingletonScoped();
             builder.Register<ThemeFolders>().As<IExtensionFolders>()
-                .WithArguments(new NamedParameter("paths", new[] { "~/Core/Themes", "~/Themes" })) // <- info: (heskew) ~/Core/Themes is itself an extension, is that too wrong/weird?
+                .WithArguments(new NamedParameter("paths", new[] { "~/Core", "~/Themes" }))
                 .SingletonScoped();
 
             registrations(builder);
diff --git a/src/Orchard/Mvc/Html/LayoutHelperExtensions.cs b/src/Orchard/Mvc/Html/LayoutHelperExtensions.cs
index 796a5c738..afde35cd5 100644
--- a/src/Orchard/Mvc/Html/LayoutHelperExtensions.cs
+++ b/src/Orchard/Mvc/Html/LayoutHelperExtensions.cs
@@ -28,6 +28,8 @@ namespace Orchard.Mvc.Html {
             html.ViewContext.HttpContext.Response.Output.Write(layoutContext.Title);
         }
 
+        public static void RenderZone(this HtmlHelper html, string zoneName, string foo) {}
+
         public static void RegisterStyle(this HtmlHelper html, string styleName) {
             //todo: register the style
         }
diff --git a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
index 3a3e79295..c028b55a2 100644
--- a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
+++ b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -67,7 +66,7 @@ namespace Orchard.Mvc.ViewEngines {
 
             var layoutViewEngine = new LayoutViewEngine(requestViewEngines);
 
-            viewResultBase.ViewEngineCollection = new ViewEngineCollection(_viewEngines);
+            viewResultBase.ViewEngineCollection = new ViewEngineCollection(_viewEngines.ToList());
             viewResultBase.ViewEngineCollection.Insert(0, layoutViewEngine);
         }
 
diff --git a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs b/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
index 884dddba7..be6d7b267 100644
--- a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
+++ b/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
@@ -54,6 +54,7 @@ namespace Orchard.Mvc.ViewEngines {
 
             viewEngine.PartialViewLocationFormats = parameters.VirtualPaths
                 .Select(x => x + "/Views/Shared/{0}.ascx")
+                .Concat(parameters.VirtualPaths.Select(s => s + "/Views/Shared/{0}.aspx"))
                 .ToArray();
 
             return viewEngine;