From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 20 Dec 2014 00:06:01 +0000 (+0100)
Subject: Fixed nested lists causing superfluous trailing newlines
X-Git-Tag: 2.1.0_Beta_3~102
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ef49bb657d7977d95f40104de35f2b2a8543070;p=GitHub%2FWoltLab%2FWCF.git

Fixed nested lists causing superfluous trailing newlines
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index c2e85cb90a..412098ec94 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -753,7 +753,7 @@ RedactorPlugins.wbbcode = function() {
 			data = data.replace(/\[list=1\]/gi, '<ul style="list-style-type: decimal">');
 			data = data.replace(/\[list=a\]/gi, '<ul style="list-style-type: lower-latin">');
 			data = data.replace(/\[list=(none|circle|square|disc|decimal|lower-roman|upper-roman|decimal-leading-zero|lower-greek|lower-latin|upper-latin|armenian|georgian)\]/gi, '<ul style="list-style-type: $1">');
-			data = data.replace(/\[\/list]\n?/gi, '</ul>\n');
+			data = data.replace(/\[\/list\]/gi, '</ul>');
 			
 			// trim whitespaces within [table]
 			data = data.replace(/\[table\]([\S\s]*?)\[\/table\]/gi, function(match, p1) {