Improved sanitation for content pasted from OpenOffice

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 37425b840e2726fe66bb49a0d09ec1232d4da2a9..abea9b286842933843f1bdfcf18b4c3e26929dfc 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1571,7 +1571,7 @@ RedactorPlugins.wbbcode = function() {
                        html = html.replace(/<\/h[1-6]>/g, '[/size]');
                        
                        // some fixes for paste from Microsoft Word / OpenOffice
-                       if (/<p class="MsoNormal/.test(html)) {
+                       if (/<p class="MsoNormal/.test(html) || /style="margin-bottom: 0cm"/.test(html)) {
                                // fix weird newlines
                                html = html.replace(/([^>\s])\n([^<\s])/g, '$1 $2');