From 954a457448d86e6dc9a4ebb5a3ac51abb2e40dca Mon Sep 17 00:00:00 2001
From: eeichinger <eeichinger@gmail.com>
Date: Wed, 5 Nov 2008 21:47:49 +0000
Subject: [PATCH] resolved SPRNET-1085

---
 src/Spring/Spring.Web/Web/UI/MasterPage.cs | 19 ++++++++++---------
 src/Spring/Spring.Web/Web/UI/Page.cs       |  6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Spring/Spring.Web/Web/UI/MasterPage.cs b/src/Spring/Spring.Web/Web/UI/MasterPage.cs
index ee7666b0..5429671f 100644
--- a/src/Spring/Spring.Web/Web/UI/MasterPage.cs
+++ b/src/Spring/Spring.Web/Web/UI/MasterPage.cs
@@ -371,15 +371,16 @@ namespace Spring.Web.UI
         /// <returns>Local ResourceManager instance.</returns>
         private ResourceManager GetLocalResourceManager()
         {
-            object resourceProvider = Page.GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
-            MethodInfo GetLocalResourceAssembly =
-                    resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
-            Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
-            if (localResourceAssembly != null)
-            {
-                return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
-            }
-            return null;
+//            object resourceProvider = Page.GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
+//            MethodInfo GetLocalResourceAssembly =
+//                    resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
+//            Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
+//            if (localResourceAssembly != null)
+//            {
+//                return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
+//            }
+//            return null;
+            return new LocalResourceManager( this.AppRelativeVirtualPath );
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Web/Web/UI/Page.cs b/src/Spring/Spring.Web/Web/UI/Page.cs
index f7c9b8f7..f08a359b 100644
--- a/src/Spring/Spring.Web/Web/UI/Page.cs
+++ b/src/Spring/Spring.Web/Web/UI/Page.cs
@@ -90,9 +90,9 @@ namespace Spring.Web.UI
         private static readonly object EventPreInit = new object();
         private static readonly object EventInitComplete = new object();
 #else
-        internal static readonly MethodInfo GetLocalResourceProvider =
-                typeof( ResourceExpressionBuilder ).GetMethod( "GetLocalResourceProvider", BindingFlags.NonPublic | BindingFlags.Static, null,
-                                                            new Type[] { typeof( TemplateControl ) }, null );
+//        internal static readonly MethodInfo GetLocalResourceProvider =
+//                typeof( ResourceExpressionBuilder ).GetMethod( "GetLocalResourceProvider", BindingFlags.NonPublic | BindingFlags.Static, null,
+//                                                            new Type[] { typeof( TemplateControl ) }, null );
 #endif
 
         #endregion