From 816618be682b8d3a842b1c089ddcdbf989dc1b35 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <mark@wordpress.org>
Date: Thu, 28 Mar 2013 05:59:18 +0000
Subject: [PATCH] Rename the_extra_content() to the_remaining_content().

fixes #23877.

git-svn-id: http://core.svn.wordpress.org/trunk@23836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentythirteen/content-audio.php | 2 +-
 wp-content/themes/twentythirteen/content-image.php | 2 +-
 wp-content/themes/twentythirteen/content-video.php | 2 +-
 wp-includes/post-formats.php                       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php
index 4e371ca2ae..984f9c33ac 100644
--- a/wp-content/themes/twentythirteen/content-audio.php
+++ b/wp-content/themes/twentythirteen/content-audio.php
@@ -26,7 +26,7 @@
 	</div><!-- .entry-media -->
 
 	<div class="entry-content">
-		<?php the_extra_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php
index 28d048f44b..fea93f750d 100644
--- a/wp-content/themes/twentythirteen/content-image.php
+++ b/wp-content/themes/twentythirteen/content-image.php
@@ -24,7 +24,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_extra_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php
index bee5da1567..f658c3e709 100644
--- a/wp-content/themes/twentythirteen/content-video.php
+++ b/wp-content/themes/twentythirteen/content-video.php
@@ -24,7 +24,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_extra_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php the_remaining_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-includes/post-formats.php b/wp-includes/post-formats.php
index b1b82ec0bd..86bcd74389 100644
--- a/wp-includes/post-formats.php
+++ b/wp-includes/post-formats.php
@@ -687,7 +687,7 @@ function the_url() {
  * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
  * @return string
  */
-function get_the_extra_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_remaining_content( $more_link_text = null, $strip_teaser = false ) {
 	global $more, $page, $format_pages, $multipage, $preview;
 
 	$post = get_post();
@@ -752,8 +752,8 @@ function get_the_extra_content( $more_link_text = null, $strip_teaser = false )
  * @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_extra_content( $more_link_text = null, $strip_teaser = false ) {
-	$extra = get_the_extra_content( $more_link_text, $strip_teaser );
+function the_remaining_content( $more_link_text = null, $strip_teaser = false ) {
+	$extra = get_the_remaining_content( $more_link_text, $strip_teaser );
 
 	remove_filter( 'the_content', 'post_formats_compat', 7 );
 	$content = apply_filters( 'the_content', $extra );