Ticket #10984: 10984.1.diff

wp-includes/feed.php

@@ -146 +146 @@
         if ( !$feed_type )
                 $feed_type = get_default_feed();
 
-        $content = apply_filters('the_content', get_the_content());
+    $content = apply_filters('the_content', get_the_content(null, 0, true));
         $content = str_replace(']]>', ']]>', $content);
         return apply_filters('the_content_feed', $content, $feed_type);
 }

wp-includes/post-template.php

@@ -177 +177 @@
  * @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false.
  * @return string
  */
-function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_content( $more_link_text = null, $strip_teaser = false, $ignorepagination = false ) {
         global $page, $more, $preview, $pages, $multipage;
 
         $post = get_post();
@@ -195 +195 @@
         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 ( $ignorepagination ) {
+        $content = implode("\n", $pages);
+    } else {
+        $content = $pages[$page-1];
+    }
         if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
                 $content = explode( $matches[0], $content, 2 );
                 if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )

wp-includes/formatting.php

@@ -2190 +2190 @@
 function wp_trim_excerpt($text = '') {
         $raw_excerpt = $text;
         if ( '' == $text ) {
-                $text = get_the_content('');
+        $text = get_the_content('', 0, true);
 
                 $text = strip_shortcodes( $text );