From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 16 Mar 2015 18:49:14 +0000 (+0100)
Subject: Improved handling of line breaks in tables
X-Git-Tag: 2.1.2~40
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2eff3cb208b8dda684d6a4cec18744bb3c226ad4;p=GitHub%2FWoltLab%2FWCF.git

Improved handling of line breaks in tables
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 7601edd752..23ea557727 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1198,6 +1198,11 @@ RedactorPlugins.wbbcode = function() {
 				}
 			}
 			
+			// fix newlines in tables represented with <p>...</p> instead of <br>
+			data = data.replace(/<td>([\s\S]+?)<\/td>/g, function(match, content) {
+				return '<td>' + content.replace(/<p>/g, '').replace(/<\/p>/g, '<br>').replace(/<br>$/, '') + '</td>';
+			});
+			
 			// insert list items
 			if ($listItems.length) {
 				for (var $i = $listItems.length - 1; $i >= 0; $i--) {