Author: krasnov
Date: 2007-02-26 11:06:17 -0500 (Mon, 26 Feb 2007)
New Revision: 73436

Modified:
   trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
* Control.cs: fixed AppRelativeTemplateSourceDirectory property, should not 
return AppRelativeTemplateSourceDirectory of master page


Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2007-02-26 15:45:09 UTC 
(rev 73435)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2007-02-26 16:06:17 UTC 
(rev 73436)
@@ -1,3 +1,8 @@
+2007-02-26  Vladimir Krasnov  <[EMAIL PROTECTED]>
+
+       * Control.cs: fixed AppRelativeTemplateSourceDirectory property, should
+       not return AppRelativeTemplateSourceDirectory of master page
+
 2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * ClientScriptManager.cs: fixed: GetScriptLiteral escapes back-slash:

Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-02-26 15:45:09 UTC 
(rev 73435)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-02-26 16:06:17 UTC 
(rev 73436)
@@ -174,7 +174,7 @@
                public string AppRelativeTemplateSourceDirectory 
                {
                        get {
-                               if (_appRelativeTemplateSourceDirectory != null)
+                               if (_appRelativeTemplateSourceDirectory != null 
&& !(this is MasterPage))
                                        return 
_appRelativeTemplateSourceDirectory;
 
                                if (Parent != null)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to