2007-06-05 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Tue, 5 Jun 2007 12:50:12 +0000 (12:50 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Tue, 5 Jun 2007 12:50:12 +0000 (12:50 -0000)
commitbf0152c8c5c9f707df95cffd4182cff725711fc9
treef33ffe70ae513ffff94b483ed847fc7cb54a9f1a
parent11b861713cf124701d471da97f5a6bfb72b85c81
2007-06-05  Marek Habersack  <mhabersack@novell.com>

* TemplateControlCompiler.cs: TemplateSourceDirectory in the 2.0
profile uses the TemplateControl property instead of Parent. This
allows to return the correct path.

2007-06-05  Marek Habersack  <mhabersack@novell.com>

* Control.cs: TemplateSourceDirectory uses TemplateControl to
lookup the virtual source directory in the 2.0 instead of the
Parent.
ResolveClientUrl copes with empty TemplateSourceDirectory in the
correct way now - the check is made after the basePath checks.
The changes above make ResolveClientUrl work properly when called
from within a control residing in a TemplateControl.

svn path=/trunk/mcs/; revision=78624
mcs/class/System.Web/System.Web.Compilation/ChangeLog
mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
mcs/class/System.Web/System.Web.UI/ChangeLog
mcs/class/System.Web/System.Web.UI/Control.cs