Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-28 15:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Merge a multi-line comment into a single-line comment in wp-includes/link-template.php.

Browse Source 
See [30166]. See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-11-04 15:59:23 +00:00
parent 256bea185d
commit d19de136c6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2333,8 +2333,7 @@ function get_the_pagination( $args = array() ) {
// Set up paginated links. // Set up paginated links.
$links = paginate_links( $args ); $links = paginate_links( $args );
// _navigation_markup() expects string, // `navigation_markup()` expects a string, `paginate_links()` can return an array.
// paginate_links() can return an array
if ( $links && ! is_array( $links ) ) { 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-30225'; $wp_version = '4.1-alpha-30226';
/** /**
* 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.