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

Timestamp:

09/05/2022 05:14:31 AM (2 years ago)

Author:

dufresnesteven

Message:

wporg-developer: Sync with ​https://github.com/WordPress/wporg-developer/commit/790d402933d2725374de0d19e6bf6a576c8b15d2

File:

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

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

@@ -21 +21 @@
         add_filter( 'wporg_markdown_after_transform',  array( $this, 'wporg_markdown_after_transform' ), 10, 2 );
         add_filter( 'wporg_markdown_edit_link',        array( $this, 'wporg_markdown_edit_link' ), 10, 2 );
-
-        add_filter( 'syntaxhighlighter_htmlresult',    array( $this, 'fix_code_entity_encoding' ) );
 
         add_action( 'pre_post_update', function( $post_id, $data ) {
@@ -144 +142 @@
 
     /**
-     * Fixes unwarranted HTML entity encoding within code shortcodes.
-     *
-     * @param string $content Post content.
-     * @return string
-     */
-    public function fix_code_entity_encoding( $content ) {
-        if ( $this->get_post_type() !== get_post_type() ) {
-            return $content;
-        }
-
-        if ( false !== mb_strpos( $content, '&' ) ) {
-            $content = preg_replace_callback(
-                '|(<pre class="brush[^>]+)(.+)(</pre)|Us',
-                function( $matches ) {
-                    return $matches[1] . html_entity_decode( $matches[2], ENT_QUOTES | ENT_HTML401 ) . $matches[3];
-                },
-                $content
-            );
-        }
-
-        return $content;
-    }
-
-    /**
      * Fixes fetched value of markdown_source meta field to not be the
      * raw.githubcontent.com domain that is currently incorrectly used
@@ -343 +317 @@
      */
     public function wporg_markdown_edit_link( $link, $post_id ) {
-        if ( $this->get_post_type() === get_post_type( $post_id ) ) {
+        if ( $this->get_post_type() === get_post_type( $post_id ) && defined( 'WP_CORE_STABLE_BRANCH' ) ) {
             $link = str_replace( '/wp/' . WP_CORE_STABLE_BRANCH . '/', '/trunk/', $link );
         }