Merge branch '1.7'

ezsystems · Dec 10, 2018 · 697da56 · 697da56
2 parents ba13194 + abe2e5c
commit 697da56
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 5 deletions.
diff --git a/lib/FieldType/XmlText/Converter/EzLinkToHtml5.php b/lib/FieldType/XmlText/Converter/EzLinkToHtml5.php
@@ -123,11 +123,14 @@ public function convert(DOMDocument $xmlDoc)
             }
 
             if ($this->elementHasAttribute($element, 'anchor_name')) {
-                $element->setAttribute(
-                    'url',
-                    $element->getAttribute('url') . '#' .
-                    $this->getElementAttribute($element, 'anchor_name')
-                );
+                $anchor = '#' . $this->getElementAttribute($element, 'anchor_name');
+                if (strpos($element->getAttribute('url'), $anchor) === false) {
+                    $element->setAttribute(
+                        'url',
+                        $element->getAttribute('url') . '#' .
+                        $this->getElementAttribute($element, 'anchor_name')
+                    );
+                }
             }
         }
     }

diff --git a/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5_core.xsl b/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Html5_core.xsl
@@ -259,4 +259,15 @@
         </xsl:copy>
     </xsl:template>
 
+    <xsl:template match="paragraph[not(text())][custom][count(custom)=count(*)]">
+        <xsl:apply-templates select="custom"/>
+    </xsl:template>
+
+    <xsl:template match="@custom|node()">
+        <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates select="@custom|node()" />
+        </xsl:copy>
+    </xsl:template>
+
 </xsl:stylesheet>
diff --git a/...s/lib/FieldType/Converter/_fixtures/html5/input/112-removeCustomTagsWrappingParagraph.xml b/...s/lib/FieldType/Converter/_fixtures/html5/input/112-removeCustomTagsWrappingParagraph.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section
+        xmlns:image="http://ez.no/namespaces/ezpublish3/image/"
+        xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
+        xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
+    <paragraph>Lorem ipsum.</paragraph>
+    <paragraph>
+        <custom name="test1">One</custom>
+        <custom name="test2" attr="test2a">Two</custom>
+        <custom name="test3"/>
+    </paragraph>
+    <paragraph>Lorem ipsum</paragraph>
+</section>
diff --git a/.../lib/FieldType/Converter/_fixtures/html5/output/112-removeCustomTagsWrappingParagraph.xml b/.../lib/FieldType/Converter/_fixtures/html5/output/112-removeCustomTagsWrappingParagraph.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5">
+    <p>Lorem ipsum.</p>
+    <custom name="test1">One</custom>
+    <custom name="test2" attr="test2a">Two</custom>
+    <custom name="test3"/>
+    <p>Lorem ipsum</p>
+</section>