From 1cdb4b52af1605afbc8170162354a3869e3dbc7c Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 13 Sep 2016 13:10:32 +0000 Subject: [PATCH] Docs: Correct description for `domain` and `path` arguments in `WP_Network_Query::__construct()`. See #32504. Built from https://develop.svn.wordpress.org/trunk@38595 git-svn-id: http://core.svn.wordpress.org/trunk@38538 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-network-query.php | 6 ++---- wp-includes/class-wp-site-query.php | 6 ++---- wp-includes/ms-blogs.php | 6 ++---- wp-includes/version.php | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/wp-includes/class-wp-network-query.php b/wp-includes/class-wp-network-query.php index e783f2f8e5..18b0361bbe 100644 --- a/wp-includes/class-wp-network-query.php +++ b/wp-includes/class-wp-network-query.php @@ -118,12 +118,10 @@ class WP_Network_Query { * 'domain_length', 'path_length' and 'network__in'. Also accepts false, * an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'. * @type string $order How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'. - * @type string $domain Limit results to those affiliated with a given network ID. - * Default current network ID. + * @type string $domain Limit results to those affiliated with a given domain. Default empty. * @type array $domain__in Array of domains to include affiliated networks for. Default empty. * @type array $domain__not_in Array of domains to exclude affiliated networks for. Default empty. - * @type string $path Limit results to those affiliated with a given network ID. - * Default current network ID. + * @type string $path Limit results to those affiliated with a given path. Default empty. * @type array $path__in Array of paths to include affiliated networks for. Default empty. * @type array $path__not_in Array of paths to exclude affiliated networks for. Default empty. * @type string $search Search term(s) to retrieve matching networks for. Default empty. diff --git a/wp-includes/class-wp-site-query.php b/wp-includes/class-wp-site-query.php index 1836ab16a7..b19b8f205e 100644 --- a/wp-includes/class-wp-site-query.php +++ b/wp-includes/class-wp-site-query.php @@ -134,12 +134,10 @@ class WP_Site_Query { * include all networks. Default 0. * @type array $network__in Array of network IDs to include affiliated sites for. Default empty. * @type array $network__not_in Array of network IDs to exclude affiliated sites for. Default empty. - * @type string $domain Limit results to those affiliated with a given domain. - * Default empty. + * @type string $domain Limit results to those affiliated with a given domain. Default empty. * @type array $domain__in Array of domains to include affiliated sites for. Default empty. * @type array $domain__not_in Array of domains to exclude affiliated sites for. Default empty. - * @type string $path Limit results to those affiliated with a given path. - * Default empty. + * @type string $path Limit results to those affiliated with a given path. Default empty. * @type array $path__in Array of paths to include affiliated sites for. Default empty. * @type array $path__not_in Array of paths to exclude affiliated sites for. Default empty. * @type int $public Limit results to public sites. Accepts '1' or '0'. Default empty. diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index a277402d56..7f9d481718 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -583,12 +583,10 @@ function update_site_cache( $sites ) { * Default current network ID. * @type array $network__in Array of network IDs to include affiliated sites for. Default empty. * @type array $network__not_in Array of network IDs to exclude affiliated sites for. Default empty. - * @type string $domain Limit results to those affiliated with a given domain. - * Default empty. + * @type string $domain Limit results to those affiliated with a given domain. Default empty. * @type array $domain__in Array of domains to include affiliated sites for. Default empty. * @type array $domain__not_in Array of domains to exclude affiliated sites for. Default empty. - * @type string $path Limit results to those affiliated with a given path. - * Default empty. + * @type string $path Limit results to those affiliated with a given path. Default empty. * @type array $path__in Array of paths to include affiliated sites for. Default empty. * @type array $path__not_in Array of paths to exclude affiliated sites for. Default empty. * @type int $public Limit results to public sites. Accepts '1' or '0'. Default empty. diff --git a/wp-includes/version.php b/wp-includes/version.php index be0af70586..c0c4a7e1b5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38594'; +$wp_version = '4.7-alpha-38595'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.