From 831dac8e6570cdaa13d8272b7190e3fecf7f06c2 Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Wed, 31 Mar 2010 07:54:59 +0000
Subject: [PATCH] Fixes 26621: nodeInstance.NodeTypeAlias always returns null

[TFS Changeset #65138]
---
 umbraco/presentation/umbraco/nodeFactory/Page.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/umbraco/presentation/umbraco/nodeFactory/Page.cs b/umbraco/presentation/umbraco/nodeFactory/Page.cs
index fb1078d809..8859703ccf 100644
--- a/umbraco/presentation/umbraco/nodeFactory/Page.cs
+++ b/umbraco/presentation/umbraco/nodeFactory/Page.cs
@@ -458,8 +458,16 @@ namespace umbraco.presentation.nodeFactory
                     if (_pageXmlNode.Attributes.GetNamedItem("writerID") != null)
                         _writerID = int.Parse(_pageXmlNode.Attributes.GetNamedItem("writerID").Value);
 
-                    if (_pageXmlNode.Attributes.GetNamedItem("nodeTypeAlias") != null)
-                        _nodeTypeAlias = _pageXmlNode.Attributes.GetNamedItem("nodeTypeAlias").Value;
+                    if (UmbracoSettings.UseLegacyXmlSchema)
+                    {
+                        if (_pageXmlNode.Attributes.GetNamedItem("nodeTypeAlias") != null)
+                            _nodeTypeAlias = _pageXmlNode.Attributes.GetNamedItem("nodeTypeAlias").Value;
+                    }
+                    else
+                    {
+                        _nodeTypeAlias = _pageXmlNode.Name;
+                    }
+
                     if (_pageXmlNode.Attributes.GetNamedItem("path") != null)
                         _path = _pageXmlNode.Attributes.GetNamedItem("path").Value;
                     if (_pageXmlNode.Attributes.GetNamedItem("version") != null)