2008-11-18 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* ControlBuilder.cs: find the correct naming container even inside
	user controls. A corner case of bug #445889.

svn path=/trunk/mcs/; revision=119130

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index aa5129b42c67f2a9c8b4ffe1b92a006889c028ef..117f018da9c8281ce3bc24753a046d96087b4828 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,9 @@
+
+2008-11-18 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * ControlBuilder.cs: find the correct naming container even inside
+       user controls. A corner case of bug #445889.
+
 2008-11-15  Marek Habersack  <mhabersack@novell.com>
 
        * INonBindingContainer.cs: added

diff --git a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
index 71c15d5681259abcb746ebb23047aa4513fbf07d..5004d21c568db41e973fc325e0fbd0a4e2db39e7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
@@ -187,7 +187,7 @@ namespace System.Web.UI {
 #endif
                Type BindingContainerType {
                        get {
-                               ControlBuilder cb = (this is TemplateBuilder) ? this : MyNamingContainer;
+                               ControlBuilder cb = (this is TemplateBuilder && !(this is RootBuilder)) ? this : MyNamingContainer;
                                if (cb == null)
                                        return typeof (Control);