From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 27 Oct 2014 14:35:23 +0000 (+0100)
Subject: Fixed quotes and italic formatting
X-Git-Tag: 2.1.0_Alpha_1~154^2~31
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ffa286018625185902ed8fac45aaf841123fd43;p=GitHub%2FWoltLab%2FWCF.git

Fixed quotes and italic formatting
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 80c02013c6..f4bb9637a2 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -278,7 +278,7 @@ RedactorPlugins.wbbcode = function() {
 			html = html.replace(/<\/(?:b|strong)>/gi, '[/b]');
 			
 			// [i]
-			html = html.replace(/<(?:i|em)>/gi, '[i]');
+			html = html.replace(/<(?:i|em)[^>]*>/gi, '[i]');
 			html = html.replace(/<\/(?:i|em)>/gi, '[/i]');
 			
 			// [u]
@@ -1182,7 +1182,7 @@ RedactorPlugins.wbbcode = function() {
 			$('<a href="#">' + WCF.Language.get('wcf.bbcode.quote.edit') + '</a>').click($.proxy(function(e) {
 				e.preventDefault();
 				
-				this._openQuoteEditOverlay($(event.currentTarget).closest('blockquote.quoteBox'), false);
+				this.wbbcode._openQuoteEditOverlay($(event.currentTarget).closest('blockquote.quoteBox'), false);
 				$('.redactor-link-tooltip').remove();
 			}, this)).appendTo($tooltip);
 			
@@ -1233,7 +1233,7 @@ RedactorPlugins.wbbcode = function() {
 					
 					this.wbbcode._updateQuoteHeader(quote);
 					
-					this.modalClose();
+					this.modal.close();
 				}, this));
 			}