From efbb8fa4e5aaf695e06a69612cd37e7bfd90cb0a Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 16 Jun 2015 19:45:26 +0000
Subject: [PATCH] Document the default list of allowed protocols in the doc
 block for `wp_allowed_protocols()` and cross-reference in `esc_url()` and the
 `kses_allowed_protocols` filter.

Props GunGeekATX.
Fixes #32421.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 +---
 wp-includes/functions.php  | 1 +
 wp-includes/version.php    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 1cea82ff41..bdabb374a6 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -3126,9 +3126,7 @@ function esc_sql( $data ) {
  *
  * @param string $url       The URL to be cleaned.
  * @param array  $protocols Optional. An array of acceptable protocols.
- *		                    Defaults to 'http', 'https', 'ftp', 'ftps', 'mailto',
- *                          'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms',
- *                          'rtsp', 'svn' if not set.
+ *		                    Defaults to return value of wp_allowed_protocols()
  * @param string $_context  Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 99cf913d9a..faed1d476e 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -4506,6 +4506,7 @@ function send_frame_options_header() {
  * @staticvar array $protocols
  *
  * @return array Array of allowed protocols.
+ *               Defaults to 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal'
  */
 function wp_allowed_protocols() {
 	static $protocols = array();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 63611f9468..d073bee497 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32796';
+$wp_version = '4.3-alpha-32797';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.