From e8bd782d47e36d512a37c589609633f676cbe303 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 18 Jan 2015 15:08:03 +0100
Subject: [PATCH] Improved pasting of <p> formatted content

---
 .../js/3rdParty/redactor/plugins/wbbcode.js   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index abb0e8b164..b92346a338 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1305,17 +1305,24 @@ RedactorPlugins.wbbcode = function() {
 		 * @return	string
 		 */
 		_pasteCallback: function(html) {
-			// reduce successive <br> by one
-			//html = html.replace(/<br[^>]*>(<br[^>]*>)+/g, '$1');
+			var $uuid = WCF.getUUID();
 			
-			// replace <p>...</p> with <p>...</p><p><br></p>
-			/*html = html.replace(/<p>([\s\S]*?)<\/p>/g, function(match, content) {
-				if (content.match(/<br( \/)?>$/)) {
+			// replace <p>...</p> with <p>...</p><p><br></p> unless there is already a newline
+			html = html.replace(/<p>([\s\S]*?)<\/p>/gi, function(match, content) {
+				if (content.match(/^<br( \/)?>$/)) {
 					return match;
 				}
 				
-				return '<p>' + content + '</p><p><br></p>';
-			});*/
+				return match + '@@@' + $uuid + '@@@';
+			});
+			
+			html = html.replace(new RegExp('@@@' + $uuid + '@@@(<p><br(?: /)?></p>)?', 'g'), function(match, next) {
+				if (next) {
+					return next;
+				}
+				
+				return '<p><br></p>';
+			});
 			
 			// restore font size
 			html = html.replace(/\[size=(\d+)\]/g, '<p><span style="font-size: $1pt">');
-- 
2.20.1