Changeset 43336

Timestamp:

06/08/2018 08:58:51 AM (5 years ago)

Author:

azaozz

Message:

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

Fixes #44308.

File:

• trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js (modified) (2 diffs)

trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -114 +114 @@
             }
 
-            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, '--><!--' );
+                }
             }
 
@@ -609 +614 @@
         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:' );
         }
     });