Changeset 21865

Timestamp:

09/16/2012 04:16:26 PM (13 years ago)

Author:

nacin

Message:

Simplify protocol stripping in add_query_arg() by avoiding a regular expression. Don't cast a known array to an array. fixes #21332.

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -656 +656 @@
         $frag = '';
 
-    if ( preg_match( '|^https?://|i', $uri, $matches ) ) {
-        $protocol = $matches[0];
-        $uri = substr( $uri, strlen( $protocol ) );
+    if ( 0 === stripos( 'http://', $uri ) ) {
+        $protocol = 'http://';
+        $uri = substr( $uri, 7 );
+    } elseif ( 0 === stripos( 'https://', $uri ) ) {
+        $protocol = 'https://';
+        $uri = substr( $uri, 8 );
     } else {
         $protocol = '';
@@ -672 +675 @@
             $query = $parts[1];
         }
-    } elseif ( !empty( $protocol ) || strpos( $uri, '=' ) === false ) {
+    } elseif ( $protocol || strpos( $uri, '=' ) === false ) {
         $base = $uri . '?';
         $query = '';
@@ -689 +692 @@
     }
 
-    foreach ( (array) $qs as $k => $v ) {
+    foreach ( $qs as $k => $v ) {
         if ( $v === false )
             unset( $qs[$k] );