Changeset 21170

Timestamp:

06/28/2012 08:30:10 PM (12 years ago)

Author:

markjaquith

Message:

Allow tel: and fax: protocols. Wrangle the last hardcoded protocol enumeration so that it uses wp_allowed_protocols(). fixes #21081

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/user.php

@@ -70 +70 @@
         } else {
             $user->user_url = esc_url_raw( $_POST['url'] );
-            $user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+            $protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
+            $user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
         }
     }

trunk/wp-includes/functions.php

@@ -3509 +3509 @@
 
     if ( empty( $protocols ) ) {
-        $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn' );
+        $protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax' );
         $protocols = apply_filters( 'kses_allowed_protocols', $protocols );
     }