Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Users: Restore changes from [35114] accidentally reverted in [35135].

Browse Source 
See #28631.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-10-13 15:45:25 +00:00
parent b36cc4deab
commit dc92982950
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-user-query.php
View File

@ -422,7 +422,7 @@ class WP_User_Query {
$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array ); $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
// limit // limit
if ( isset( $qv['number'] ) && $qv['number'] ) { if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
if ( $qv['offset'] ) { if ( $qv['offset'] ) {
$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']); $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
} else { } else {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35137'; $wp_version = '4.4-alpha-35138';
/** /**
* 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.