Merge pull request #14 from damianz5/EZP-25759

EZP-25759: Expanding converter paragraph>custom>section parsing fixed
ezsystems · May 19, 2016 · 7c5aba8 · 7c5aba8
2 parents 54dd496 + 1a3fe07
commit 7c5aba8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/lib/FieldType/XmlText/Converter/Expanding.php b/lib/FieldType/XmlText/Converter/Expanding.php
@@ -164,6 +164,7 @@ private function containsBlock(DOMElement $paragraph)
         return (
             $xpath->query($containedExpression, $paragraph)->length !== 0
             || $xpath->query('custom/paragraph', $paragraph)->length !== 0
+            || $xpath->query('custom/section', $paragraph)->length !== 0
         );
     }
 

diff --git a/tests/lib/FieldType/Converter/_fixtures/expanding/input/012-customTagSection.xml b/tests/lib/FieldType/Converter/_fixtures/expanding/input/012-customTagSection.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/"
+           xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/"
+           xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/">
+    <custom name="factbox" custom:title="factbox" custom:align="left">
+        <section>
+            <header>header</header>
+            <paragraph>paragraph</paragraph>
+        </section>
+    </custom>
+</paragraph>
diff --git a/tests/lib/FieldType/Converter/_fixtures/expanding/output/012-customTagSection.xml b/tests/lib/FieldType/Converter/_fixtures/expanding/output/012-customTagSection.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paragraph xmlns:tmp="http://ez.no/namespaces/ezpublish3/temporary/"
+           xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/"
+           xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/" ez-temporary="1">
+    <custom name="factbox" custom:title="factbox" custom:align="left">
+        <section>
+            <header>header</header>
+            <paragraph>paragraph</paragraph>
+        </section>
+    </custom>
+</paragraph>