From c24e451ae3cfe248c550bece91723f0efdf55165 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Mon, 3 Feb 2014 20:25:08 +0000
Subject: [PATCH] TinyMCE: don't replace <i> with <em> and <b> with <strong>
 and don't remove them when empty, see #24067, see #23037.

git-svn-id: https://develop.svn.wordpress.org/trunk@27083 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/tinymce/plugins/wordpress/plugin.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
index 670a59c1e8..4eb4f7423b 100644
--- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -348,6 +348,11 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		}
 	});
 
+	editor.on( 'preInit', function() {
+		// Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty
+		editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' );
+	});
+
 	// Add custom shortcuts
 	modKey = 'alt+shift';