From baf5f568f215c2f7b16c603d6ae55ed11c388a97 Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Tue, 7 May 2019 10:06:45 +0100
Subject: [PATCH 1/3] EZP-30513: Inore nested embed/embed-inline inside link

---
 .../XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl b/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
index 7e4556b5..876675b4 100644
--- a/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
+++ b/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
@@ -617,6 +617,9 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="link/embed|link/embed-inline">
+  </xsl:template>
+
   <xsl:template name="addEmbedLinkAttributes">
     <xsl:variable name="fragment">
       <xsl:if test="@ezlegacytmp-embed-link-anchor_name != ''">

From 088199292f635b2694e65d794f19f6cdbccf1632 Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Tue, 7 May 2019 10:07:03 +0100
Subject: [PATCH 2/3] EZP-30513: tests

---
 .../FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml    | 3 +++
 .../lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
index 9ce2897f..c335b655 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
@@ -21,4 +21,7 @@
     <link xlink:href="ezcontent://333" xlink:show="none" xml:id="id5" xlink:title="Content title" ezxhtml:class="linkClass5">Content name</link>
   </para>
   <para><anchor xml:id="anchor"/>Some anchored content.</para>
+  <para>
+    <link xlink:href="ezcontent://333" xlink:show="none" xml:id="id7">link with nested embed</link>
+  </para>
 </section>
diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
index 5d39db51..84d877f3 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
@@ -21,4 +21,7 @@
     <link object_id="333" xhtml:id="id5" xhtml:title="Content title" class="linkClass5">Content name</link>
   </paragraph>
   <paragraph><anchor name="anchor"/>Some anchored content.</paragraph>
+  <paragraph>
+    <link object_id="333" xhtml:id="id7">Link with nested embed<embed-inline view="embed-inline" size="original" object_id="444"/></link>
+  </paragraph>
 </section>

From 6c09e0b30e2c19f09f09c7ba553933a6da884d19 Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Fri, 9 Aug 2019 10:55:39 +0300
Subject: [PATCH 3/3] EZP-30513: fixes for tests

---
 tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
index 84d877f3..cd451e26 100644
--- a/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
+++ b/tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
@@ -22,6 +22,6 @@
   </paragraph>
   <paragraph><anchor name="anchor"/>Some anchored content.</paragraph>
   <paragraph>
-    <link object_id="333" xhtml:id="id7">Link with nested embed<embed-inline view="embed-inline" size="original" object_id="444"/></link>
+    <link object_id="333" xhtml:id="id7">link with nested embed<embed-inline view="embed-inline" size="original" object_id="444"/></link>
   </paragraph>
 </section>