From 18d30ffeb0e1e6912f72f09117e9bbd59b089f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <none@none>
Date: Sun, 28 Nov 2010 19:02:25 -0800
Subject: [PATCH 1/3] Fixing unit test

--HG--
branch : dev
---
 .../Users/Controllers/AdminControllerTests.cs                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
index 93440ef52..6f6d395cb 100644
--- a/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
@@ -35,6 +35,7 @@ using Orchard.Users.Services;
 using Orchard.Users.ViewModels;
 using Orchard.Settings;
 using Orchard.Core.Settings.Services;
+using Orchard.Environment.Configuration;
 
 namespace Orchard.Tests.Modules.Users.Controllers {
     [TestFixture]
@@ -68,6 +69,7 @@ namespace Orchard.Tests.Modules.Users.Controllers {
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<Signals>().As<ISignals>();
+            builder.RegisterInstance(new ShellSettings { Name = "Alpha", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "~/foo" });
 
             _authorizer = new Mock<IAuthorizer>();
             builder.RegisterInstance(_authorizer.Object);

From a1c8765fa09bf32936e60567dc3e1340c638735a Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 29 Nov 2010 10:21:54 -0800
Subject: [PATCH 2/3] Making the Resolve<TService> HtmlHelper extension method
 throw once again if a WorkContext isn't found in the request

--HG--
branch : dev
---
 src/Orchard/Mvc/Html/ContainerExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Orchard/Mvc/Html/ContainerExtensions.cs b/src/Orchard/Mvc/Html/ContainerExtensions.cs
index 035947e99..480478bb0 100644
--- a/src/Orchard/Mvc/Html/ContainerExtensions.cs
+++ b/src/Orchard/Mvc/Html/ContainerExtensions.cs
@@ -2,6 +2,7 @@ using System;
 using System.Web.Mvc;
 
 namespace Orchard.Mvc.Html {
+    public interface IFoo{}
     public static class ContainerExtensions {
         /// <summary>
         /// This method performed by Erik Weisz.
@@ -12,7 +13,7 @@ namespace Orchard.Mvc.Html {
             var workContext = html.ViewContext.RequestContext.GetWorkContext();
 
             if (workContext == null)
-                return default(TService);
+                throw new ApplicationException(string.Format(@"The WorkContext cannot be found for the request. Unable to resolve '{0}'.", typeof(TService)));
 
             return workContext.Resolve<TService>();
         }

From 3827c90f415efe65ff8e717df3e7d87b83d82861 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 29 Nov 2010 10:24:28 -0800
Subject: [PATCH 3/3] Changing how the versioned compliment to the CommonPart
 is welded to the content type in question so as to not have potentially odd
 problems with an ActivatingFilter applied CommonPart

--HG--
branch : dev
---
 src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
index 9ef052cb7..c012a3ddb 100644
--- a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
+++ b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
@@ -35,8 +35,6 @@ namespace Orchard.Core.Common.Handlers {
             Filters.Add(StorageFilter.For(commonRepository));
             Filters.Add(StorageFilter.For(commonVersionRepository));
 
-            Filters.Add(new ActivatingFilter<ContentPart<CommonPartVersionRecord>>(ContentTypeWithACommonPart));
-
             OnInitializing<CommonPart>(PropertySetHandlers);
             OnInitializing<CommonPart>(AssignCreatingOwner);
             OnInitializing<CommonPart>(AssignCreatingDates);
@@ -61,6 +59,11 @@ namespace Orchard.Core.Common.Handlers {
 
         public Localizer T { get; set; }
 
+        protected override void Activating(ActivatingContentContext context) {
+            if (ContentTypeWithACommonPart(context.ContentType))
+                context.Builder.Weld<ContentPart<CommonPartVersionRecord>>();
+        }
+
         bool ContentTypeWithACommonPart(string typeName) {
             //Note: What about content type handlers which activate "CommonPart" in code?
             var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName);