1 files changed, 15 insertions, 21 deletions

diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
index 215b2f7381e..77f683035db 100644
--- a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
@@ -50,7 +50,7 @@ namespace System.Web.Compilation
 		}
 
 		protected override void CreateConstructor (CodeStatementCollection localVars,
-							   CodeStatementCollection trueStmt)
+							CodeStatementCollection trueStmt)
 		{
 			if (pageParser.ClientTarget != null) {
 				CodeExpression prop;
@@ -61,6 +61,17 @@ namespace System.Web.Compilation
 				localVars.Add (new CodeAssignStatement (prop, ct));
 			}
 
+#if NET_2_0
+			if (pageParser.MasterPageFile != null) {
+				CodeExpression prop;
+				prop = new CodePropertyReferenceExpression (thisRef, "MasterPageFile");
+				CodeExpression ct = new CodePrimitiveExpression (pageParser.MasterPageFile);
+				if (localVars == null)
+					localVars = new CodeStatementCollection ();
+				localVars.Add (new CodeAssignStatement (prop, ct));
+			}
+#endif
+
 			base.CreateConstructor (localVars, trueStmt);
 		}
 		
@@ -85,32 +96,15 @@ namespace System.Web.Compilation
 			mainClass.Members.Add (method);
 		}
 
-		static CodeAssignStatement CreatePropertyAssign (CodeExpression expr, string name, object value)
+		static CodeAssignStatement CreatePropertyAssign (string name, object value)
 		{
 			CodePropertyReferenceExpression prop;
-			prop = new CodePropertyReferenceExpression (expr, name);
+			prop = new CodePropertyReferenceExpression (thisRef, name);
 			CodePrimitiveExpression prim;
 			prim = new CodePrimitiveExpression (value);
 			return new CodeAssignStatement (prop, prim);
 		}
 
-		static CodeAssignStatement CreatePropertyAssign (string name, object value)
-		{
-			return CreatePropertyAssign (thisRef, name, value);
-		}
-
-		protected override void AddStatementsToInitMethod (CodeMemberMethod method)
-		{
-#if NET_2_0
-			CodeArgumentReferenceExpression ctrlVar = new CodeArgumentReferenceExpression("__ctrl");
-			if (pageParser.Title != null)
-				method.Statements.Add (CreatePropertyAssign (ctrlVar, "Title", pageParser.Title));
-
-			if (pageParser.MasterPageFile != null)
-				method.Statements.Add (CreatePropertyAssign (ctrlVar, "MasterPageFile", pageParser.MasterPageFile));
-#endif
-		}
-
 		protected override void AddStatementsToFrameworkInitialize (CodeMemberMethod method)
 		{
 			string responseEncoding = pageParser.ResponseEncoding;
@@ -196,7 +190,7 @@ namespace System.Web.Compilation
 				};
 		}
                 
-		protected internal override void CreateMethods ()
+		protected override void CreateMethods ()
 		{
 			base.CreateMethods ();