From cda0fa1f76a2aba90d21f254c14ddfe3aae2289a Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Tue, 28 Jul 2015 14:11:04 +0000
Subject: [PATCH] Fill empty TinyMCE paragraphs with a dummy `<br />` on all
 browsers.

fixes #33151
props iseulde

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

diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
index f27ecb5553..2c47676852 100644
--- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -92,8 +92,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 	// Replace Read More/Next Page tags with images
 	editor.on( 'BeforeSetContent', function( event ) {
-		var title,
-			paragraph = tinymce.Env.webkit ? '<p><br /></p>' : '<p></p>';
+		var title;
 
 		if ( event.content ) {
 			if ( event.content.indexOf( '<!--more' ) !== -1 ) {
@@ -113,12 +112,12 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 						'title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
 			}
 
-			// Remove spaces from empty paragraphs.
-			event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph );
-
 			if ( event.load && event.format !== 'raw' && hasWpautop ) {
 				event.content = wp.editor.autop( event.content );
 			}
+
+			// Remove spaces from empty paragraphs.
+			event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, '<p><br /></p>' );
 		}
 	});