From d2c9dd8b5a395209c5a9e6388f36804b696ff1a7 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Mon, 13 Jun 2005 17:16:14 +0000 Subject: [PATCH] 2005-06-13 Lluis Sanchez Gual * MasterPage.cs: Clear the default content of placeholders before adding the page content. Fixes bug #75193. svn path=/trunk/mcs/; revision=45886 --- mcs/class/System.Web/System.Web.UI/ChangeLog | 5 +++++ mcs/class/System.Web/System.Web.UI/MasterPage.cs | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index f63beb24d18e4..86caa9a802013 100644 --- 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 + + * MasterPage.cs: Clear the default content of placeholders before + adding the page content. Fixes bug #75193. + 2005-06-13 Lluis Sanchez Gual * 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 index 08075e9ed5d2c..1f725c33e09c1 100644 --- 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); + } } } }