From c02e019a8149e176d59dabe2422e438f46e8b2ca Mon Sep 17 00:00:00 2001
From: Gianluigi Martino <gmartino27@gmail.com>
Date: Wed, 15 Mar 2017 16:20:05 +0100
Subject: [PATCH] [TASK] Remove inline styles from parsed blockquote tag

The inline styles were removed from CSS Styled Content
but not in Fluid Styled Content.

Now this is also removed in EXT:fluid_styled_content.

Releases: master
Resolves: #80171
Change-Id: I91343b803d6da0b651b6984c8c94c2583730aa40
Reviewed-on: https://review.typo3.org/52059
Reviewed-by: Josef Glatz <josef.glatz@typo3.org>
Tested-by: Josef Glatz <josef.glatz@typo3.org>
Reviewed-by: Benjamin Kott <benjamin.kott@outlook.com>
Tested-by: Benjamin Kott <benjamin.kott@outlook.com>
---
 ...RTEInlineStylesFromParsedBlockquoteTag.rst | 64 +++++++++++++++++++
 .../TypoScript/Helper/ParseFunc.txt           |  9 +--
 .../TypoScript/Helper/ParseFunc.txt           | 11 +---
 3 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Breaking-80171-RemoveLibparseFunc_RTEInlineStylesFromParsedBlockquoteTag.rst

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-80171-RemoveLibparseFunc_RTEInlineStylesFromParsedBlockquoteTag.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-80171-RemoveLibparseFunc_RTEInlineStylesFromParsedBlockquoteTag.rst
new file mode 100644
index 000000000000..bdb8ae8c0037
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-80171-RemoveLibparseFunc_RTEInlineStylesFromParsedBlockquoteTag.rst
@@ -0,0 +1,64 @@
+.. include:: ../../Includes.txt
+
+====================================================================================
+Breaking: #80171 - Remove lib.parseFunc_RTE inline styles from parsed blockquote tag
+====================================================================================
+
+See :issue:`80171`
+
+Description
+===========
+
+With https://forge.typo3.org/issues/44879 the inline styles were removed from CSC.
+However, the change was not applied to FSC.
+
+
+Impact
+======
+
+:typoscript:`lib.parseFunc_RTE` doesn't overwrite the attributes of :html:`<blockquote/>`
+and don't add the style attribute anymore.
+
+
+Affected Installations
+======================
+
+All installations using the :typoscript:`lib.parseFunc_RTE` provided by
+EXT:fluid_styled_content where
+
+.. code-block:: typoscript
+
+   lib.parseFunc_RTE {
+      externalBlocks {
+         blockquote {
+            callRecursive {
+               tagStdWrap {
+                  HTMLparser = 1
+                  HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
+               }
+            }
+         }
+      }
+   }
+
+wasn't overwritten manually.
+
+
+Migration
+=========
+
+If your frontend relies on this inline CSS styles, make sure to add following CSS on
+your own:
+
+.. code-block:: css
+
+   blockquote {
+      margin-top: 0;
+      margin-bottom: 0;
+   }
+
+Additionally you have to check if some other attributes are now added/preserved to
+:html:`<blockquote/>` due the fact, that the former typoscript has removed all
+attributes before adding the style attribute.
+
+.. index:: Frontend, TypoScript, ext:fluid_styled_content
diff --git a/typo3/sysext/css_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt b/typo3/sysext/css_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
index fcb8fb4aa424..26ce1223db93 100644
--- a/typo3/sysext/css_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
+++ b/typo3/sysext/css_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
@@ -54,8 +54,6 @@ lib.parseFunc_RTE {
     externalBlocks = article, aside, blockquote, div, dd, dl, footer, header, nav, ol, section, table, ul, pre
     externalBlocks {
         # The blockquote content is passed into parseFunc again...
-        blockquote.stripNL=1
-        blockquote.callRecursive=1
         table.stripNL=1
         table.stdWrap.HTMLparser = 1
         table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
@@ -73,10 +71,13 @@ lib.parseFunc_RTE {
             }
             addChr10BetweenParagraphs=1
         }
-        div.stripNL = 1
-        div.callRecursive = 1
+        div {
+            stripNL = 1
+            callRecursive = 1
+        }
         article < .div
         aside < .div
+        blockquote < .div
         footer < .div
         header < .div
         nav < .div
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
index dad864556481..2fecbe11bff9 100644
--- a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
+++ b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
@@ -54,16 +54,6 @@ lib.parseFunc_RTE {
     externalBlocks = article, aside, blockquote, div, dd, dl, footer, header, nav, ol, section, table, ul, pre
     externalBlocks {
         # The blockquote content is passed into parseFunc again...
-        blockquote {
-            stripNL = 1
-            callRecursive = 1
-            callRecursive {
-                tagStdWrap {
-                    HTMLparser = 1
-                    HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
-                }
-            }
-        }
         ol {
             stripNL = 1
             stdWrap.parseFunc = < lib.parseFunc
@@ -101,6 +91,7 @@ lib.parseFunc_RTE {
         }
         article < .div
         aside < .div
+        blockquote < .div
         footer < .div
         header < .div
         nav < .div
-- 
2.20.1