From 33b8bb3cf32718248d193e3831d6bfd61b527f75 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 31 Oct 2016 07:06:32 +0000 Subject: [PATCH] Docs: Clarify descriptions for `home_url()` and `get_home_url()` on the true effect of the `$scheme` parameter. Part props thomaswm. Props stevenlinx. Fixes #36468. Built from https://develop.svn.wordpress.org/trunk@39054 git-svn-id: http://core.svn.wordpress.org/trunk@38996 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/link-template.php | 12 ++++++------ wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index bbe43e187a..009ed06cee 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -2954,9 +2954,9 @@ function get_shortcut_link() { /** * Retrieves the URL for the current site where the front end is accessible. * - * Returns the 'home' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If `$scheme` is 'http' or 'https', - * `is_ssl()` is overridden. + * Returns the 'home' option with the appropriate protocol. The protocol will be 'https' + * if is_ssl() evaluates to true; otherwise, it will be the same as the 'home' option. + * If `$scheme` is 'http' or 'https', is_ssl() is overridden. * * @since 3.0.0 * @@ -2972,9 +2972,9 @@ function home_url( $path = '', $scheme = null ) { /** * Retrieves the URL for a given site where the front end is accessible. * - * Returns the 'home' option with the appropriate protocol, 'https' if - * is_ssl() and 'http' otherwise. If `$scheme` is 'http' or 'https', - * `is_ssl()` is overridden. + * Returns the 'home' option with the appropriate protocol. The protocol will be 'https' + * if is_ssl() evaluates to true; otherwise, it will be the same as the 'home' option. + * If `$scheme` is 'http' or 'https', is_ssl() is overridden. * * @since 3.0.0 * diff --git a/wp-includes/version.php b/wp-includes/version.php index d3d99eaafe..3beb593e43 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-beta1-39053'; +$wp_version = '4.7-beta1-39054'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.