瀏覽代碼

2003-10-21 Gonzalo Paniagua Javier <[email protected]>

	* TemplateControlCompiler.cs: fix bug #42994. Now we don't generate
	a return statement for user controls with 'void' return type.

svn path=/trunk/mcs/; revision=19282
Gonzalo Paniagua Javier 22 年之前
父節點
當前提交
4f4db5ab86

+ 5 - 0
mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,3 +1,8 @@
+2003-10-21  Gonzalo Paniagua Javier <[email protected]>
+
+	* TemplateControlCompiler.cs: fix bug #42994. Now we don't generate
+	a return statement for user controls with 'void' return type.
+
 2003-10-19  Gonzalo Paniagua Javier <[email protected]>
 
 	* AspParser.cs: fixed bug #49627.

+ 1 - 1
mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs

@@ -676,7 +676,7 @@ namespace System.Web.Compilation
 				builder.method.Statements.Add (invoke);
 			}
 			
-			if (typeof (Control).IsAssignableFrom (builder.ControlType))
+			if (!childrenAsProperties && typeof (Control).IsAssignableFrom (builder.ControlType))
 				builder.method.Statements.Add (new CodeMethodReturnStatement (ctrlVar));
 		}