Changeset 6259

Timestamp:

12/11/2017 08:57:30 PM (8 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Move explanation content retrieval into new template tag, get_explanation_content().

Location:

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

Files:

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

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

@@ -1402 +1402 @@
 
     /**
+     * Retrieve the post content from an explanation post.
+     *
+     * @param int|WP_Post $_post Post ID or object for the function, hook, class, or method post
+     *                           to retrieve an explanation field for.
+     * @return string The post content of the explanation.
+     */
+    function get_explanation_content( $_post ) {
+        global $post;
+
+        // Temporarily remove filter.
+        remove_filter( 'the_content', array( 'DevHub_Formatting', 'fix_unintended_markdown' ), 1 );
+
+        // Store original global post.
+        $orig = $post;
+
+        // Set global post to the explanation post.
+        $post = get_explanation( $_post );
+
+        // Get explanation's raw post content.
+        $content = get_explanation_field( 'post_content', $_post );
+
+        // Pass the content through expected content filters.
+        $content = apply_filters( 'the_content', apply_filters( 'get_the_content', $content ) );
+
+        // Restore original global post.
+        $post = $orig;
+
+        // Restore filter.
+        add_filter( 'the_content', array( 'DevHub_Formatting', 'fix_unintended_markdown' ), 1 );
+
+        return $content;
+    }
+
+    /**
      * Generates a private access message for a private element.
      *

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

@@ -9 +9 @@
 namespace DevHub;
 
-if ( $explanation = get_explanation_field( 'post_content', get_the_ID() ) ) :
+if ( $explanation = get_explanation_content( get_the_ID() ) ) :
     ?>
     <hr />
@@ -15 +15 @@
         <h2><?php _e( 'More Information', 'wporg' ); ?></h2>
 
-        <?php
-        // Output the explanation. Passed through 'the_content' on retrieval, thus no escaping.
-        remove_filter( 'the_content', array( 'DevHub_Formatting', 'fix_unintended_markdown' ), 1 );
-        global $post;
-        $orig = $post;
-        $post = get_explanation( get_the_ID() );
-        echo apply_filters( 'the_content', apply_filters( 'get_the_content', $explanation ) );
-        $post = $orig;
-        add_filter( 'the_content', array( 'DevHub_Formatting', 'fix_unintended_markdown' ), 1 );
-        ?>
+        <?php echo $explanation; // Already escaped. ?>
     </section>
 <?php endif; ?>