Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-15 07:05:37 +01:00
Code Issues Projects Releases Wiki Activity

Rename (get_)the_pagination() to (get_)the_posts_pagination() for clarity.

Browse Source 
Merges [30823] to the 4.1 branch

See #29808
Props obenland

Built from https://develop.svn.wordpress.org/branches/4.1@30825


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2014-12-11 10:35:22 +00:00
parent 7918030a9c
commit e2ad21e041
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/link-template.php
View File

@ -2238,7 +2238,7 @@ function the_post_navigation( $args = array() ) {
* @global WP_Query $wp_query WordPress Query object. * @global WP_Query $wp_query WordPress Query object.
* *
* @param array $args { * @param array $args {
* Optional. Default paging navigation arguments. Default empty array. * Optional. Default posts navigation arguments. Default empty array.
* *
* @type string $prev_text Anchor text to display in the previous posts link. * @type string $prev_text Anchor text to display in the previous posts link.
* Default 'Older posts'. * Default 'Older posts'.
@ -2247,7 +2247,7 @@ function the_post_navigation( $args = array() ) {
* @type string $screen_reader_text Screen reader text for nav element. * @type string $screen_reader_text Screen reader text for nav element.
* Default 'Posts navigation'. * Default 'Posts navigation'.
* } * }
* @return string Markup for paging links. * @return string Markup for posts links.
*/ */
function get_the_posts_navigation( $args = array() ) { function get_the_posts_navigation( $args = array() ) {
$navigation = ''; $navigation = '';
@ -2271,7 +2271,7 @@ function get_the_posts_navigation( $args = array() ) {
$navigation .= '<div class="nav-next">' . $next_link . '</div>'; $navigation .= '<div class="nav-next">' . $next_link . '</div>';
} }
$navigation = _navigation_markup( $navigation, 'paging-navigation', $args['screen_reader_text'] ); $navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] );
} }
return $navigation; return $navigation;
@ -2303,7 +2303,7 @@ function the_posts_navigation( $args = array() ) {
* } * }
* @return string Markup for pagination links. * @return string Markup for pagination links.
*/ */
function get_the_pagination( $args = array() ) { function get_the_posts_pagination( $args = array() ) {
$navigation = ''; $navigation = '';
// Don't print empty markup if there's only one page. // Don't print empty markup if there's only one page.
@ -2337,11 +2337,11 @@ function get_the_pagination( $args = array() ) {
* *
* @since 4.1.0 * @since 4.1.0
* *
* @param array $args Optional. See {@see get_the_pagination()} for available arguments. * @param array $args Optional. See {@see get_the_posts_pagination()} for available arguments.
* Default empty array. * Default empty array.
*/ */
function the_pagination( $args = array() ) { function the_posts_pagination( $args = array() ) {
echo get_the_pagination( $args ); echo get_the_posts_pagination( $args );
} }
/** /**
@ -2351,11 +2351,11 @@ function the_pagination( $args = array() ) {
* @access private * @access private
* *
* @param string $links Navigational links. * @param string $links Navigational links.
* @param string $class Optional. Custom class for nav element. Default: 'paging-navigation'. * @param string $class Optional. Custom class for nav element. Default: 'posts-navigation'.
* @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'. * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'.
* @return string Navigation template tag. * @return string Navigation template tag.
*/ */
function _navigation_markup( $links, $class = 'paging-navigation', $screen_reader_text = '' ) { function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) {
if ( empty( $screen_reader_text ) ) { if ( empty( $screen_reader_text ) ) {
$screen_reader_text = __( 'Posts navigation' ); $screen_reader_text = __( 'Posts navigation' );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30822'; $wp_version = '4.1-beta2-30825';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.