From f6e1aeee60e815562c6e562aef4512279f6884a8 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 25 Mar 2015 01:17:04 +0000
Subject: [PATCH] TinyMCE: pad empty paragraphs with `<br>` in Chrome to stop
 it from inserting non-breaking spaces in them. Props iseulde. Fixes #31255.

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

diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
index fd2cf2646f..3a5b72a2c8 100644
--- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -394,8 +394,10 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 	// Remove spaces from empty paragraphs.
 	editor.on( 'BeforeSetContent', function( event ) {
+		var paragraph = tinymce.Env.webkit ? '<p><br /></p>' : '<p></p>';
+
 		if ( event.content ) {
-			event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF| )+<\/p>/gi, '<p></p>' );
+			event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph );
 		}
 	});