From f6ef138b5e7a33370fab753decae5e86dad68e57 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 23 May 2012 15:02:03 +0000
Subject: [PATCH] Bug 860 - scopes.xsl does not handle role descriptors with
 existing scopes correctly

---
 mdx/uk/scopes.xsl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mdx/uk/scopes.xsl b/mdx/uk/scopes.xsl
index 1d303a0c..ea29fed2 100644
--- a/mdx/uk/scopes.xsl
+++ b/mdx/uk/scopes.xsl
@@ -99,16 +99,16 @@
 					<xsl:copy-of select="."/>
 					<xsl:text>&#10;        </xsl:text>
 				</xsl:for-each>
-                <!-- copy scopes from member outsource records -->
-				<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
-					<xsl:text>    </xsl:text>
-                    <xsl:element name="shibmd:Scope">
-                        <xsl:attribute name="regexp">false</xsl:attribute>
-                        <xsl:value-of select="."/>
-                    </xsl:element>
-                    <xsl:text>&#10;        </xsl:text>
-                </xsl:for-each>
 			</xsl:if>			
+			<!-- copy scopes from member outsource records -->
+			<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
+				<xsl:text>    </xsl:text>
+				<xsl:element name="shibmd:Scope">
+					<xsl:attribute name="regexp">false</xsl:attribute>
+					<xsl:value-of select="."/>
+				</xsl:element>
+				<xsl:text>&#10;        </xsl:text>
+			</xsl:for-each>
 		</xsl:copy>
 	</xsl:template>