2005-06-13 Lluis Sanchez Gual <lluis@novell.com>

* MasterPage.cs: Clear the default content of placeholders before adding the page content. Fixes bug #75193. svn path=/trunk/mcs/; revision=45886
mono · Jun 13, 2005 · d2c9dd8 · d2c9dd8
1 parent 2fee37b
commit d2c9dd8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-13  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MasterPage.cs: Clear the default content of placeholders before
+	adding the page content. Fixes bug #75193.
+
 2005-06-13  Lluis Sanchez Gual <lluis@novell.com>
 
 	* PageParser.cs: Added MasterType property. Get the type from the

diff --git a/mcs/class/System.Web/System.Web.UI/MasterPage.cs b/mcs/class/System.Web/System.Web.UI/MasterPage.cs
@@ -59,8 +59,10 @@ internal void FillPlaceHolders ()
 		{
 			foreach (ContentPlaceHolder place in placeholders) {
 				ITemplate template = templates [place.ID] as ITemplate;
-				if (template != null)
+				if (template != null) {
+					place.Controls.Clear ();
 					template.InstantiateIn (place);
+				}
 			}
 		}
 	}