Merge branch 'upstream' into debian/sid

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/sisu/v0/shared_xml.rb b/lib/sisu/v0/shared_xml.rb
index 4b9ccb12..da1891e5 100644
--- a/lib/sisu/v0/shared_xml.rb
+++ b/lib/sisu/v0/shared_xml.rb
@@ -391,6 +391,9 @@ module SiSU_XML_munge
     def markup_group(para='')
       para.gsub!(/</,'&lt;'); para.gsub!(/>/,'&gt;')
       para.gsub!(/&lt;:?br(?:\s+\/)?&gt;/,'<br />')
+      para.gsub!(/&lt;(link xmlns:xlink=".+?)"&gt;/,'<"\1">')
+      para.gsub!(/&lt;(\/link)&gt;/,'<\1>')
+      para.gsub!(/&lt;(\/?en)&gt;/,'<\1>')
       para
     end
   end