Changeset 25324

Timestamp:

09/10/2013 06:43:16 PM (11 years ago)

Author:

nacin

Message:

Better protocol validation in set_url_scheme(). Merges [25319] to 3.6.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-includes/link-template.php (modified) (1 diff)

branches/3.6/wp-includes/link-template.php

@@ -2239 +2239 @@
     }
 
-    if ( 'relative' == $scheme )
-        $url = preg_replace( '#^.+://[^/]*#', '', $url );
-    else
-        $url = preg_replace( '#^.+://#', $scheme . '://', $url );
+    $url = trim( $url );
+    if ( $url[0] === '/' && $url[1] === '/' )
+        $url = 'http:' . $url;
+
+    if ( 'relative' == $scheme ) {
+        $url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
+        if ( $url[0] === '/' )
+            $url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+    } else {
+        $url = preg_replace( '#^\w+://#', $scheme . '://', $url );
+    }
 
     return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );