From a79b6fdde327f91ad44765e9bb419beffd362b47 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 1 Nov 2014 22:41:23 +0000 Subject: [PATCH] In `get_the_pagination()`, don't pass `$links` to `_navigation_markup()` if it is not a string - `paginate_links()` can return an `array`. 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 --- wp-includes/link-template.php | 4 +++- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 235fa79cd5..effc3063a6 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -2333,7 +2333,9 @@ function get_the_pagination( $args = array() ) { // Set up paginated links. $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' ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index b31f3d3429..080a6cf4ff 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.