merge -r 58784:58785

[mono.git] / mcs / class / System.Web / System.Web.UI / TemplateParser.cs

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
index 7994f5c004f8fccdffdeff4b0d3b5088cf76fd17..8a82aca3bbfad06f20414100410a2327c214b2dd 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -431,7 +431,10 @@ namespace System.Web.UI {
 
                        string inherits = GetString (atts, "Inherits", null);
 #if NET_2_0
-                       className = inherits;
+                       if (srcAssembly == null)
+                               className = inherits;
+                       else
+                               SetBaseType (inherits);
 #else
                        if (inherits != null)
                                SetBaseType (inherits);