Changeset 10067

Timestamp:

07/13/2020 09:44:22 PM (5 years ago)

Author:

coffee2code

Message:

Developer theme: Fix the fix for the parsing bug regarding 'code' tags misapplied during parsing.

Bug became evident in text containing multiple code tags where some 'code' tags were correctly present in the original text.

Props ocean90, coffee2code.
Fixes #5304.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/formatting.php (modified) (5 diffs)

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

@@ -39 +39 @@
         add_filter( 'devhub-format-description', array( __CLASS__, 'autolink_references' ) );
         add_filter( 'devhub-format-description', array( __CLASS__, 'fix_param_hash_formatting' ), 9 );
-        add_filter( 'devhub-format-description', array( __CLASS__, 'fix_param_description_parsedown_bug' ) );
         add_filter( 'devhub-format-description', array( __CLASS__, 'fix_param_description_html_as_code' ) );
+
+        add_filter( 'devhub-format-hash-param-description', array( __CLASS__, 'autolink_references' ) );
+        add_filter( 'devhub-format-hash-param-description', array( __CLASS__, 'fix_param_description_parsedown_bug' ) );
 
         add_filter( 'devhub-function-return-type', array( __CLASS__, 'autolink_references' ) );
@@ -229 +231 @@
                     sanitize_title_with_dashes( html_entity_decode( $link ) );
         }
-        
+
         if ( $url ) {
             $link = self::generate_link( $url, $link );
@@ -265 +267 @@
         return sprintf( '<a%s>%s</a>', $attributes, esc_html( $text ) );
     }
-    
+
     /**
      * Fixes unintended markup generated by Markdown during parsing.
@@ -511 +513 @@
             list( $wordtype, $type, $name, $description ) = explode( ' ', $part . '    ', 4 ); // extra spaces ensure we'll always have 4 items.
             $description = trim( $description );
-            $description = self::autolink_references( $description );
+
+            $description = apply_filters( 'devhub-format-hash-param-description', $description );
 
             $skip_closing_li = false;
@@ -582 +585 @@
             '/`(.+)<code>/'        => '<code>$1</code>',
             '/<\/code>(.+)`/'      => ' <code>$1</code>',
-            '/<\/code>(.+)<code>/' => ' <code>$1</code>',
         );
 
+        // Determine if code tags look inverted.
+        $first_start = strpos( $text, '<code>' );
+        $first_end = strpos( $text, '</code>' );
+        if ( false !== $first_start && false !== $first_end && $first_end < $first_start ) {
+            $fixes[ '~</code>(.+)<code>~U' ] = ' <code>$1</code>';
+        }
+
         $matched = true;
 
         foreach ( $fixes as $regex => $replace ) {
-            if ( $matched && $matched = preg_match( $regex, $text, $match ) ) {
-                $text = preg_replace( $regex, $replace, $text );
-            }
+            $text = preg_replace( $regex, $replace, $text );
         }