IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In get_the_pagination(), don't pass $links to _navigation_markup() if it is not a string - paginate_links() can return an array.

Browse Source 
See #30224.

Built from https://develop.svn.wordpress.org/trunk@30166


git-svn-id: http://core.svn.wordpress.org/trunk@30166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-11-01 22:41:23 +00:00
parent 892be738b0
commit a79b6fdde3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2333,7 +2333,9 @@ function get_the_pagination( $args = array() ) {
// Set up paginated links. // Set up paginated links.
$links = paginate_links( $args ); $links = paginate_links( $args );
if ( $links ) { // _navigation_markup() expects string,
// paginate_links() can return an array
if ( $links && ! is_array( $links ) ) {
$navigation = _navigation_markup( $links, 'pagination' ); $navigation = _navigation_markup( $links, 'pagination' );
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30165'; $wp_version = '4.1-alpha-30166';
/** /**
* 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.