Changeset 8803

Timestamp:

05/16/2019 11:15:28 PM (6 years ago)

Author:

coffee2code

Message:

Developer: Use SyntaxHighligher-specific hook for more targeted fix for double-encoded HTML entities in code shortcodes.

Fixes a bug that cropped up using the previous approach that in specific situations somehow caused SyntaxHighlighter to have a code block subsume all text up to and through the next code block.

See #4457.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/import-block-editor.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/import-block-editor.php

@@ -18 +18 @@
         add_filter( 'wporg_markdown_after_transform',  array( $this, 'wporg_markdown_after_transform' ), 10, 2 );
 
-        add_filter( 'the_content',                     array( $this, 'fix_code_entity_encoding' ), 6 );
+        add_filter( 'syntaxhighlighter_htmlresult',    array( $this, 'fix_code_entity_encoding' ) );
 
         add_action( 'pre_post_update', function( $post_id, $data ) {
@@ -73 +73 @@
         }
 
-        if ( false !== mb_strpos( $content, '[code' ) ) {
+        if ( false !== mb_strpos( $content, '&' ) ) {
             $content = preg_replace_callback(
-                '|(\[code[^\]]*\])(.+)(\[\/code\])|Us',
+                '|(<pre class="brush[^>]+)(.+)(</pre)|Us',
                 function( $matches ) {
                     return $matches[1] . html_entity_decode( $matches[2], ENT_QUOTES | ENT_HTML401 ) . $matches[3];