Changeset 24301 for trunk/wp-includes/post-formats.php

Timestamp:

05/20/2013 11:05:50 AM (13 years ago)

Author:

ryan

Message:

• Introduce wp_parse_post_content() and use it in setup_postdata(), get_the_content(), and get_the_remaining_content().
• Add a post ID argument to the_content(), get_the_content(), the_remaining_content(), and get_the_remaining_content().
• Pass the post ID to the the_content filter.
• Remove the format_pages global.
• Declare format_content and split_content as vars in WP_Post.
• phpdoc for the the_content filter that documents the new ID argument and denotes it as not-so-portable.

Props gcorne, DrewAPicture, duck_, aaroncampbell
see #24330

File:

• trunk/wp-includes/post-formats.php (modified) (3 diffs)

trunk/wp-includes/post-formats.php

@@ -867 +867 @@
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
+ * @param int $id Optional. A post id. Defaults to the current post when in The Loop, undefined otherwise.
  * @return string The content minus the extracted post format content.
  */
-function get_the_remaining_content( $more_link_text = null, $strip_teaser = false ) {
-        global $more, $page, $format_pages, $multipage, $preview;
-
-        $post = get_post();
+function get_the_remaining_content( $more_link_text = null, $strip_teaser = false, $id = 0 ) {
+        global $more, $page, $preview;
+
+        $post = get_post( $id );
+
+        extract( wp_parse_post_content( $post, true ) );
 
         if ( null === $more_link_text )
@@ -881 +884 @@
 
         // If post password required and it doesn't match the cookie.
-        if ( post_password_required() )
-                return get_the_password_form();
-
-        if ( $page > count( $format_pages ) ) // if the requested page doesn't exist
-                $page = count( $format_pages ); // give them the highest numbered page that DOES exist
-
-        $content = $format_pages[$page-1];
+        if ( post_password_required( $post ) )
+                return get_the_password_form( $post );
+
+        if ( $page > count( $pages ) ) // if the requested page doesn't exist
+                $page = count( $pages ); // give them the highest numbered page that DOES exist
+
+        $content = $pages[$page-1];
         if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
                 $content = explode( $matches[0], $content, 2 );
@@ -932 +935 @@
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
- */
-function the_remaining_content( $more_link_text = null, $strip_teaser = false ) {
-        $extra = get_the_remaining_content( $more_link_text, $strip_teaser );
+ * @param int $id Optional. A post id. Defaults to the current post when in The Loop, undefined otherwise.
+ */
+function the_remaining_content( $more_link_text = null, $strip_teaser = false, $id = 0 ) {
+        $post = get_post( $id );
+
+        $extra = get_the_remaining_content( $more_link_text, $strip_teaser, $post->ID );
 
         remove_filter( 'the_content', 'post_formats_compat', 7 );
-        $content = apply_filters( 'the_content', $extra );
-        add_filter( 'the_content', 'post_formats_compat', 7 );
+        $content = apply_filters( 'the_content', $extra, $post->ID );
+        add_filter( 'the_content', 'post_formats_compat', 7, 2 );
 
         echo str_replace( ']]>', ']]&gt;', $content );