From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 20 Jun 2015 14:28:21 +0000 (+0200)
Subject: Fixed handling of newlines in <td> with lists
X-Git-Tag: 2.1.5~17^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0deacc4ad535b7adea816401faf7e37aea3887f5;p=GitHub%2FWoltLab%2FWCF.git

Fixed handling of newlines in <td> with lists
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 7a8239c53f..2741e23ed0 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1226,7 +1226,9 @@ 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>';
+				content = content.replace(/<br(?: \/)?>(<[uo]l)/g, '$1');
+				
+				return '<td>' + content.replace(/<p><br(?: \/)?><\/p>/g, '<br>').replace(/<p>/g, '').replace(/<\/p>/g, '<br>').replace(/<br>$/, '') + '</td>';
 			});
 			
 			// insert list items