From 503b36dd2300ab3a426bc8f1778784f3f1821690 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Sat, 7 Mar 2015 16:08:27 +0000 Subject: [PATCH] Fix documentation whitespace after [31663]. See #31265. Built from https://develop.svn.wordpress.org/trunk@31664 git-svn-id: http://core.svn.wordpress.org/trunk@31645 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/user.php | 16 ++++++++-------- wp-includes/version.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wp-includes/user.php b/wp-includes/user.php index 4e12df6c1f..d382beac5e 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -523,14 +523,14 @@ class WP_User_Query { * @type array $search_columns Array of column names to be searched. Accepts 'ID', 'login', * 'nicename', 'email', 'url'. Default empty array. * @type string|array $orderby Field to sort the retrieved users by. May be a single value, - * an array of values, or a multi-dimensional array with fields as keys - * and orders ('ASC' or 'DESC') as values. Accepted values are'ID', - * 'display_name' (or 'name'), 'user_login' (or 'login'), - * 'user_nicename' (or 'nicename'), 'user_email' (or 'email'), - * 'user_url' (or 'url'), 'user_registered' (or 'registered'), - * 'post_count', 'meta_value', or 'meta_value_num'. To use 'meta_value' - * or 'meta_value_num', `$meta_key` must be also be defined. - * Default 'user_login'. + * an array of values, or a multi-dimensional array with fields as keys + * and orders ('ASC' or 'DESC') as values. Accepted values are'ID', + * 'display_name' (or 'name'), 'user_login' (or 'login'), + * 'user_nicename' (or 'nicename'), 'user_email' (or 'email'), + * 'user_url' (or 'url'), 'user_registered' (or 'registered'), + * 'post_count', 'meta_value', or 'meta_value_num'. To use 'meta_value' + * or 'meta_value_num', `$meta_key` must be also be defined. + * Default 'user_login'. * @type string $order Designates ascending or descending order of users. Order values * passed as part of an `$orderby` array take precedence over this * parameter. Accepts 'ASC', 'DESC'. Default 'ASC'. diff --git a/wp-includes/version.php b/wp-includes/version.php index 9544711a3b..ed6f6f8227 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31663'; +$wp_version = '4.2-alpha-31664'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.