Fixed bug #1539010, fix xml.base.dirs template to stop recursing

if hit an absolute uri.

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index aad21a426608a76018b3d023a8d1ac9b38df9ce4..ee8b869076657494cd0a284d854dbe7f9d5ac462 100644 (file)
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -1755,8 +1755,10 @@ node location.</para>
 <xsl:template name="xml.base.dirs">
   <xsl:param name="base.elem" select="NONODE"/>
 
-  <!-- Recursively resolve xml:base attributes -->
-  <xsl:if test="$base.elem/ancestor::*[@xml:base != '']">
+  <!-- Recursively resolve xml:base attributes, up to a 
+       full path with : in uri -->
+  <xsl:if test="$base.elem/ancestor::*[@xml:base != ''] and
+                not(contains($base.elem/@xml:base, ':'))">
     <xsl:call-template name="xml.base.dirs">
       <xsl:with-param name="base.elem" 
                       select="$base.elem/ancestor::*[@xml:base != ''][1]"/>