From 763f34d117c9feb473732ac5851b1d56d912ea13 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Fri, 9 Feb 2018 17:48:29 +0000 Subject: [PATCH] Docs: Correct some secondary documentation for the `https_local_ssl_verify` and `https_ssl_verify` filters. See #42505 Built from https://develop.svn.wordpress.org/trunk@42680 git-svn-id: http://core.svn.wordpress.org/trunk@42508 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-http-curl.php | 4 ++-- wp-includes/class-wp-http-streams.php | 16 ++-------------- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/wp-includes/class-wp-http-curl.php b/wp-includes/class-wp-http-curl.php index 2704735414..e52aee4d92 100644 --- a/wp-includes/class-wp-http-curl.php +++ b/wp-includes/class-wp-http-curl.php @@ -112,10 +112,10 @@ class WP_Http_Curl { $is_local = isset( $r['local'] ) && $r['local']; $ssl_verify = isset( $r['sslverify'] ) && $r['sslverify']; if ( $is_local ) { - /** This filter is documented in wp-includes/class-wp-http-streams.php */ + /** This filter is documented in wp-includes/class-http.php */ $ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify ); } elseif ( ! $is_local ) { - /** This filter is documented in wp-includes/class-wp-http-streams.php */ + /** This filter is documented in wp-includes/class-http.php */ $ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify ); } diff --git a/wp-includes/class-wp-http-streams.php b/wp-includes/class-wp-http-streams.php index 2ed6412443..48faa15350 100644 --- a/wp-includes/class-wp-http-streams.php +++ b/wp-includes/class-wp-http-streams.php @@ -93,22 +93,10 @@ class WP_Http_Streams { $is_local = isset( $r['local'] ) && $r['local']; $ssl_verify = isset( $r['sslverify'] ) && $r['sslverify']; if ( $is_local ) { - /** - * Filters whether SSL should be verified for local requests. - * - * @since 2.8.0 - * - * @param bool $ssl_verify Whether to verify the SSL connection. Default true. - */ + /** This filter is documented in wp-includes/class-http.php */ $ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify ); } elseif ( ! $is_local ) { - /** - * Filters whether SSL should be verified for non-local requests. - * - * @since 2.8.0 - * - * @param bool $ssl_verify Whether to verify the SSL connection. Default true. - */ + /** This filter is documented in wp-includes/class-http.php */ $ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 9012200068..470c692119 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42679'; +$wp_version = '5.0-alpha-42680'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.