From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 28 Oct 2015 12:01:41 +0000 (+0100)
Subject: Improved sanitation for content pasted from OpenOffice
X-Git-Tag: 2.1.9~30
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=15790116da52f3ae1c637ae2b26fa2f7b0ca4553;p=GitHub%2FWoltLab%2FWCF.git

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 37425b840e..abea9b2868 100644
--- 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');