Changeset 3796

Timestamp:

08/09/2016 10:52:06 PM (8 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Use a better approach to preventing fix_unintended_markdown() from running against explanations.

• Revert [1914].
• In get_explanation_field(), don't run value through 'the_content' filter. It's not applicable for all fields. And post_content is already passed through the filter in the template prior to display (thus this also prevents double-filtering).
• Temporarily unhook fix_unintended_markdown() from 'the_content' filter when outputting the explanation content.
• Hook 'the_content' for fix_unintended_markdown() at a priority of 1. Also, it's a filter, not an action.

See #1250.

Location:

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

Files:

• inc/formatting.php (modified) (3 diffs)
• inc/template-tags.php (modified) (1 diff)
• reference/template-explanation.php (modified) (1 diff)

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

@@ -22 +22 @@
      */
     public static function do_init() {
+        // NOTE: This filtering is temporarily disabled and then restored in
+        // reference/template-explanation.php
+        add_filter( 'the_content', array( __CLASS__, 'fix_unintended_markdown' ), 1 );
+
         add_filter( 'the_excerpt', array( __CLASS__, 'lowercase_P_dangit_just_once' ) );
         add_filter( 'the_content', array( __CLASS__, 'make_doclink_clickable' ), 10, 5 );
@@ -34 +38 @@
 
         add_filter( 'devhub-format-description', array( __CLASS__, 'fix_param_hash_formatting' ), 9 );
-        add_action( 'the_content', array( __CLASS__, 'fix_unintended_markdown' ) );
 
         add_filter( 'devhub-function-return-type', array( __CLASS__, 'autolink_references' ) );
@@ -205 +208 @@
     public static function fix_unintended_markdown( $content, $post_type = null ) {
         // Only apply to parsed content that have the em tag.
-        if ( DevHub\is_parsed_post_type( $post_type )
-            && false !== strpos( $content, '<em>' )
-            && false === strpos( $content, '<p>' )
-        ) {
+        if ( DevHub\is_parsed_post_type( $post_type ) && false !== strpos( $content, '<em>' ) ) {
             $content = preg_replace_callback(
                 '/([^\s])<em>(.+)<\/em>/',

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

@@ -1328 +1328 @@
         }
 
-        $post_field = get_post_field( $field, $explanation, $context );
-
-        return apply_filters( 'the_content', apply_filters( 'get_the_content', $post_field ) );
+        return get_post_field( $field, $explanation, $context );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/reference/template-explanation.php

@@ -17 +17 @@
         <?php
         // Output the explanation. Passed through 'the_content' on retrieval, thus no escaping.
+        remove_filter( 'the_content', array( 'DevHub_Formatting', 'fix_unintended_markdown' ), 1 );
         echo apply_filters( 'the_content', apply_filters( 'get_the_content', $explanation ) );
+        add_filter( 'the_content', array( 'DevHub_Formatting', 'fix_unintended_markdown' ), 1 );
         ?>
     </section>