From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 5 Oct 2016 15:25:52 +0000 (+0200)
Subject: Fixed ampersands not being restored inside code tags
X-Git-Tag: 3.0.0_Beta_3~50^2~83
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52d7d75bf6107d5e337de05138105980d3a91312;p=GitHub%2FWoltLab%2FWCF.git

Fixed ampersands not being restored inside code tags
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
index 2b8fc71d20..4f287512bf 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
@@ -35,9 +35,6 @@ $.Redactor.prototype.WoltLabClean = function() {
 				var div = elCreate('div');
 				var replacements = {};
 				
-				// fix ampersands being replaced
-				html = html.replace(/&amp;/g, '@@@WCF_AMPERSAND@@@');
-				
 				if (html.indexOf('<pre') !== -1) {
 					div.innerHTML = html;
 					
@@ -53,6 +50,9 @@ $.Redactor.prototype.WoltLabClean = function() {
 				
 				html = html.replace(/<p>\u200B<\/p>/g, '<p><br></p>');
 				
+				// fix ampersands being replaced
+				html = html.replace(/&amp;/g, '@@@WCF_AMPERSAND@@@');
+				
 				html = mpOnSync.call(this, html);
 				
 				// restore ampersands