diff options
| author | Lluis Sanchez <lluis@novell.com> | 2005-06-13 21:16:14 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2005-06-13 21:16:14 +0400 |
| commit | d2c9dd8b5a395209c5a9e6388f36804b696ff1a7 (patch) | |
| tree | 8b68e65390bdab97db67cd017c1c6c9ae8091799 /mcs | |
| parent | 2fee37b32bf9bd52d26deef0c74337dd8f121d19 (diff) | |
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
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/MasterPage.cs | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index f63beb24d18..86caa9a8020 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 <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 index 08075e9ed5d..1f725c33e09 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 @@ namespace System.Web.UI { foreach (ContentPlaceHolder place in placeholders) { ITemplate template = templates [place.ID] as ITemplate; - if (template != null) + if (template != null) { + place.Controls.Clear (); template.InstantiateIn (place); + } } } } |