Parcourir la source

2008-12-02 Gonzalo Paniagua Javier <[email protected]>

	* Page.cs: make sure we don't return null in Title.


svn path=/trunk/mcs/; revision=120550
Gonzalo Paniagua Javier il y a 17 ans
Parent
commit
20e96bae9a

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

@@ -1,3 +1,8 @@
+
+2008-12-02 Gonzalo Paniagua Javier <[email protected]>
+
+	* Page.cs: make sure we don't return null in Title.
+
 2008-12-02  Marek Habersack  <[email protected]>
 
 	* DataBinder.cs: when Eval attempts to find Items [] in the

+ 1 - 1
mcs/class/System.Web/System.Web.UI/Page.cs

@@ -664,7 +664,7 @@ public partial class Page : TemplateControl, IHttpHandler
 	public string Title {
 		get {
 			if (_title == null) {
-				if (htmlHeader != null)
+				if (htmlHeader != null && htmlHeader.Title != null)
 					return htmlHeader.Title;
 				return String.Empty;
 			}