Changeset 32797

Timestamp:

06/16/2015 07:44:39 PM (10 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk/src/wp-includes

Files:

• formatting.php (modified) (1 diff)
• functions.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -3127 +3127 @@
  * @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.

trunk/src/wp-includes/functions.php

@@ -4507 +4507 @@
  *
  * @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() {