From 1e4fb9d3f69d5336efdeab06b1cc9a9468dc532e Mon Sep 17 00:00:00 2001
From: boxbinary <unknown@kiln.example.com>
Date: Wed, 31 Mar 2010 23:31:30 +0000
Subject: [PATCH] [TFS Changeset #65165]

---
 .../umbraco/xslt/templates/RSSFeed.xslt       | 176 +++++++++---------
 .../xslt/templates/Schema2/RSSFeed.xslt       |   2 +-
 .../xslt/templates/Schema2/RelatedLinks.xslt  |   2 +-
 umbraco/presentation/web.config.INDIGO64.xslt |   2 +-
 4 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/umbraco/presentation/umbraco/xslt/templates/RSSFeed.xslt b/umbraco/presentation/umbraco/xslt/templates/RSSFeed.xslt
index 60b45dc01a..3043f44a68 100644
--- a/umbraco/presentation/umbraco/xslt/templates/RSSFeed.xslt
+++ b/umbraco/presentation/umbraco/xslt/templates/RSSFeed.xslt
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-  version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:rssdatehelper="urn:rssdatehelper"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:rssdatehelper="urn:rssdatehelper"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
   xmlns:msxml="urn:schemas-microsoft-com:xslt" 
   xmlns:umbraco.library="urn:umbraco.library" {0}
   exclude-result-prefixes="msxml umbraco.library {1}">
-
-
-  <xsl:output method="xml" omit-xml-declaration="yes"/>
-
-  <xsl:param name="currentPage"/>
-
-  <!-- Update these variables to modify the feed -->
-  <xsl:variable name="RSSNoItems" select="string('10')"/>
-  <xsl:variable name="RSSTitle" select="string('My sample rss')"/>
-  <xsl:variable name="SiteURL" select="string('Add your url here')"/>
-  <xsl:variable name="RSSDescription" select="string('Add your description here')"/>
-
-  <!-- This gets all news and events and orders by updateDate to use for the pubDate in RSS feed -->
-  <xsl:variable name="pubDate">
-    <xsl:for-each select="$currentPage/node">
-      <xsl:sort select="@createDate" data-type="text" order="descending" />
-      <xsl:if test="position() = 1">
-        <xsl:value-of select="updateDate" />
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:template match="/">
-    <!-- change the mimetype for the current page to xml -->
-    <xsl:value-of select="umbraco.library:ChangeContentType('text/xml')"/>
-
-    <xsl:text disable-output-escaping="yes">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</xsl:text>
-    <rss version="2.0"
-    xmlns:content="http://purl.org/rss/1.0/modules/content/"
-    xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
->
-
-      <channel>
-        <title>
-          <xsl:value-of select="$RSSTitle"/>
-        </title>
-        <link>
-          <xsl:value-of select="$SiteURL"/>
-        </link>
-        <pubDate>
-          <xsl:value-of select="$pubDate"/>
-        </pubDate>
-        <generator>umbraco</generator>
-        <description>
-          <xsl:value-of select="$RSSDescription"/>
-        </description>
-        <language>en</language>
-
-        <xsl:apply-templates select="$currentPage/node [string(data [@alias='umbracoNaviHide']) != '1']">
-          <xsl:sort select="@createDate" order="descending" />
-        </xsl:apply-templates>
-      </channel>
-    </rss>
-
-  </xsl:template>
-
-  <xsl:template match="node">
-    <xsl:if test="position() &lt;= $RSSNoItems">
-      <item>
-        <title>
-          <xsl:value-of select="@nodeName"/>
-        </title>
-        <link>
-          <xsl:value-of select="$SiteURL"/>
-          <xsl:value-of select="umbraco.library:NiceUrl(@id)"/>
-        </link>
-        <pubDate>
-          <xsl:value-of select="umbraco.library:FormatDateTime(@createDate,'r')" />
-        </pubDate>
-        <guid>
-          <xsl:value-of select="$SiteURL"/>
-          <xsl:value-of select="umbraco.library:NiceUrl(@id)"/>
-        </guid>
-        <content:encoded>
-          <xsl:value-of select="concat('&lt;![CDATA[ ', ./data [@alias='bodyText'],']]&gt;')" disable-output-escaping="yes"/>
-        </content:encoded>
-      </item>
-    </xsl:if>
-  </xsl:template>
-
+
+
+  <xsl:output method="xml" omit-xml-declaration="yes"/>
+
+  <xsl:param name="currentPage"/>
+
+  <!-- Update these variables to modify the feed -->
+  <xsl:variable name="RSSNoItems" select="string('10')"/>
+  <xsl:variable name="RSSTitle" select="string('My sample rss')"/>
+  <xsl:variable name="SiteURL" select="string('Add your url here')"/>
+  <xsl:variable name="RSSDescription" select="string('Add your description here')"/>
+
+  <!-- This gets all news and events and orders by updateDate to use for the pubDate in RSS feed -->
+  <xsl:variable name="pubDate">
+    <xsl:for-each select="$currentPage/node">
+      <xsl:sort select="@createDate" data-type="text" order="descending" />
+      <xsl:if test="position() = 1">
+        <xsl:value-of select="updateDate" />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:variable>
+
+  <xsl:template match="/">
+    <!-- change the mimetype for the current page to xml -->
+    <xsl:value-of select="umbraco.library:ChangeContentType('text/xml')"/>
+
+    <xsl:text disable-output-escaping="yes">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</xsl:text>
+    <rss version="2.0"
+    xmlns:content="http://purl.org/rss/1.0/modules/content/"
+    xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+
+      <channel>
+        <title>
+          <xsl:value-of select="$RSSTitle"/>
+        </title>
+        <link>
+          <xsl:value-of select="$SiteURL"/>
+        </link>
+        <pubDate>
+          <xsl:value-of select="$pubDate"/>
+        </pubDate>
+        <generator>umbraco</generator>
+        <description>
+          <xsl:value-of select="$RSSDescription"/>
+        </description>
+        <language>en</language>
+
+        <xsl:apply-templates select="$currentPage/node [string(data [@alias='umbracoNaviHide']) != '1']">
+          <xsl:sort select="@createDate" order="descending" />
+        </xsl:apply-templates>
+      </channel>
+    </rss>
+
+  </xsl:template>
+
+  <xsl:template match="node">
+    <xsl:if test="position() &lt;= $RSSNoItems">
+      <item>
+        <title>
+          <xsl:value-of select="@nodeName"/>
+        </title>
+        <link>
+          <xsl:value-of select="$SiteURL"/>
+          <xsl:value-of select="umbraco.library:NiceUrl(@id)"/>
+        </link>
+        <pubDate>
+          <xsl:value-of select="umbraco.library:FormatDateTime(@createDate,'r')" />
+        </pubDate>
+        <guid>
+          <xsl:value-of select="$SiteURL"/>
+          <xsl:value-of select="umbraco.library:NiceUrl(@id)"/>
+        </guid>
+        <content:encoded>
+          <xsl:value-of select="concat('&lt;![CDATA[ ', ./data [@alias='bodyText'],']]&gt;')" disable-output-escaping="yes"/>
+        </content:encoded>
+      </item>
+    </xsl:if>
+  </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/xslt/templates/Schema2/RSSFeed.xslt b/umbraco/presentation/umbraco/xslt/templates/Schema2/RSSFeed.xslt
index bffb39681c..28baec3fa6 100644
--- a/umbraco/presentation/umbraco/xslt/templates/Schema2/RSSFeed.xslt
+++ b/umbraco/presentation/umbraco/xslt/templates/Schema2/RSSFeed.xslt
@@ -83,7 +83,7 @@
           <xsl:value-of select="umbraco.library:NiceUrl(@id)"/>
         </guid>
         <content:encoded>
-          <xsl:value-of select="concat('&lt;![CDATA[ ', .bodyText,']]&gt;')" disable-output-escaping="yes"/>
+          <xsl:value-of select="concat('&lt;![CDATA[ ', ./bodyText,']]&gt;')" disable-output-escaping="yes"/>
         </content:encoded>
       </item>
     </xsl:if>
diff --git a/umbraco/presentation/umbraco/xslt/templates/Schema2/RelatedLinks.xslt b/umbraco/presentation/umbraco/xslt/templates/Schema2/RelatedLinks.xslt
index 4d0e8ccde9..cbf781b1df 100644
--- a/umbraco/presentation/umbraco/xslt/templates/Schema2/RelatedLinks.xslt
+++ b/umbraco/presentation/umbraco/xslt/templates/Schema2/RelatedLinks.xslt
@@ -19,7 +19,7 @@
 
     <!-- The fun starts here -->
     <ul>
-      <xsl:for-each select="$currentPage/* [name() = $propertyAlias]/links/link">
+      <xsl:for-each select="$currentPage/* [name() = $propertyAlias and not(@isDoc)]/links/link">
         <li>
           <xsl:element name="a">
             <xsl:if test="./@newwindow = '1'">
diff --git a/umbraco/presentation/web.config.INDIGO64.xslt b/umbraco/presentation/web.config.INDIGO64.xslt
index a9f747a8eb..9a244c17f8 100644
--- a/umbraco/presentation/web.config.INDIGO64.xslt
+++ b/umbraco/presentation/web.config.INDIGO64.xslt
@@ -7,7 +7,7 @@
     <xsl:attribute name="value">Data Source=.\SQLEXPRESS;Initial Catalog=BB_Umbraco_Sandbox1;integrated security=false;user id=umbraco;pwd=umbraco</xsl:attribute>
   </xsl:template>
   <xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
-    <xsl:attribute name="value">4.1.0.beta</xsl:attribute>
+    <xsl:attribute name="value"></xsl:attribute>
   </xsl:template>
   
   <!-- Default templates to match anything else -->