Changeset 49055

Timestamp:

09/26/2020 09:00:19 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

Add ircs and irc6 to the list of allowed protocols.

This adds support for the secure and ipv6 variants of the already allowed irc protocol.

Props arealnobrainer, markparnell, ctmartin.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (3 diffs)
• tests/phpunit/tests/customize/nav-menu-item-setting.php (modified) (1 diff)
• tests/phpunit/tests/functions/allowedProtocols.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -6296 +6296 @@
  * @since 4.7.0 Added 'urn' to the protocols array.
  * @since 5.3.0 Added 'sms' to the protocols array.
+ * @since 5.6.0 Added 'irc6' and 'ircs' to the protocols array.
  *
  * @see wp_kses()
@@ -6301 +6302 @@
  *
  * @return string[] Array of allowed protocols. Defaults to an array containing 'http', 'https',
- *                  'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet',
- *                  'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', and 'urn'.
+ *                  'ftp', 'ftps', 'mailto', 'news', 'irc', 'irc6', 'ircs', 'gopher', 'nntp', 'feed',
+ *                  'telnet', 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', and 'urn'.
  *                  This covers all common link protocols, except for 'javascript' which should not
  *                  be allowed for untrusted users.
@@ -6310 +6311 @@
 
     if ( empty( $protocols ) ) {
-        $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', 'urn' );
+        $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'irc6', 'ircs', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', 'urn' );
     }
 

trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php

@@ -517 +517 @@
             'news://news.server.example/example.group.this',
             'irc://irc.freenode.net/wordpress',
+            'irc6://irc.freenode.net/wordpress',
+            'ircs://irc.freenode.net/wordpress',
             'gopher://example.com',
             'nntp://news.server.example/example.group.this',

trunk/tests/phpunit/tests/functions/allowedProtocols.php

@@ -47 +47 @@
             array( 'news', 'news://news.server.example/example.group.this' ),      // RFC5538
             array( 'irc', 'irc://example.com/wordpress' ),
+            array( 'irc6', 'irc6://example.com/wordpress' ),
+            array( 'ircs', 'ircs://example.com/wordpress' ),
             array( 'gopher', 'gopher://example.com/7a_gopher_selector%09foobar' ), // RFC4266
             array( 'nntp', 'nntp://news.server.example/example.group.this' ),      // RFC5538