vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TinyMCE: prevent creation of paragraphs from multiple HTML comments when wpautop is disabled.

Browse Source 
Fixes #44308.

git-svn-id: https://develop.svn.wordpress.org/trunk@43336 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2018-06-08 08:58:51 +00:00
parent 8d9cd406fb
commit a56df22d91
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js
Vendored
+10 -2
View File
@@ -113,8 +113,13 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
'alt="" title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
}
if ( event.load && event.format !== 'raw' && hasWpautop ) {
event.content = wp.editor.autop( event.content );
if ( event.load && event.format !== 'raw' ) {
if ( hasWpautop ) {
event.content = wp.editor.autop( event.content );
} else {
// Prevent creation of paragraphs out of multiple HTML comments.
event.content = event.content.replace( /-->\s+<!--/g, '--><!--' );
}
}
if ( event.content.indexOf( '<script' ) !== -1 || event.content.indexOf( '<style' ) !== -1 ) {
@@ -608,6 +613,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
if ( hasWpautop ) {
event.content = wp.editor.removep( event.content );
} else {
// Restore formatting of block boundaries.
event.content = event.content.replace( /-->\s*<!-- wp:/g, '-->\n\n<!-- wp:' );
}
});