Ticket #16943: 16943.patch

wp-includes/formatting.php

@@ -1245 +1245 @@
         if ( is_array($value) ) {
                 $value = array_map('stripslashes_deep', $value);
         } elseif ( is_object($value) ) {
-                $vars = get_object_vars( $value );
-                foreach ($vars as $key=>$data) {
-                        $value->{$key} = stripslashes_deep( $data );
+                foreach ( $value as &$data ) {
+                        $data = stripslashes_deep( $data );
                 }
         } else {
                 $value = stripslashes($value);
@@ -1268 +1267 @@
  * @return array|string $value The encoded array (or string from the callback).
  */
 function urlencode_deep($value) {
-        $value = is_array($value) ? array_map('urlencode_deep', $value) : urlencode($value);
+        is_array( $value ) ? array_walk_recursive( $value, 'urlencode_ref' ) : $value = urlencode($value);
         return $value;
 }
 
 /**
+ * map urlencode() onto a reference
+ * 
+ * @since 3.2
+ * @param string $value to be urlencoded
+ */
+function urlencode_ref( &$value ) {
+        $value = urlencode( $value );
+}
+
+/**
  * Converts email addresses characters to HTML entities to block spam bots.
  *
  * @since 0.71

wp-includes/functions.php

@@ -1377 +1377 @@
  * using this function. You can also retrieve the full URL with query data.
  *
  * Adding a single key & value or an associative array. Setting a key value to
- * emptystring removes the key. Omitting oldquery_or_uri uses the $_SERVER
- * value.
+ * an empty string removes the key. Omitting oldquery_or_uri uses the 
+ * $_SERVER['REQUEST_URI'] value.
  *
  * @since 1.5.0
  *
- * @param mixed $param1 Either newkey or an associative_array
- * @param mixed $param2 Either newvalue or oldquery or uri
- * @param mixed $param3 Optional. Old query or uri
+ * @param array|string $param1 Either newkey or an associative_array
+ * @param string $param2 Either newvalue or Optional. Old query or uri
+ * @param string $param3 Optional. Old query or uri
  * @return string New URL query string.
  */
 function add_query_arg() {
-        $ret = '';
-        if ( is_array( func_get_arg(0) ) ) {
-                if ( @func_num_args() < 2 || false === @func_get_arg( 1 ) )
-                        $uri = $_SERVER['REQUEST_URI'];
-                else
-                        $uri = @func_get_arg( 1 );
-        } else {
-                if ( @func_num_args() < 3 || false === @func_get_arg( 2 ) )
-                        $uri = $_SERVER['REQUEST_URI'];
-                else
-                        $uri = @func_get_arg( 2 );
+        $args = func_get_args();
+        $args = array_merge( $args , array_fill( 0, 3, false )); # all unset parameter are false
+
+        // if first param is not an array, it forms together with the second parameter
+        // the key=value pair. Every other argument shifts one to front then.
+        if ( ! is_array( $args[0] ) ) {
+                $key = array_shift( $args );
+                $args[0] = array( $key => $args[0] );
         }
 
-        if ( $frag = strstr( $uri, '#' ) )
-                $uri = substr( $uri, 0, -strlen( $frag ) );
-        else
-                $frag = '';
+        // the last argument is either query or uri, default is $_SERVER['REQUEST_URI']
+        $uri = false === $args[1] ? $_SERVER['REQUEST_URI'] : $args[1];
 
-        if ( preg_match( '|^https?://|i', $uri, $matches ) ) {
-                $protocol = $matches[0];
-                $uri = substr( $uri, strlen( $protocol ) );
-        } else {
-                $protocol = '';
-        }
+        // pop fragment off, defaults to empty fragment 
+        if ( $fragment = (string) strstr( $uri, '#' ) )
+                $uri = substr( $uri, 0, -strlen( $fragment ) );
 
+        // shift scheme off, defaults to empty scheme
+        if ( $scheme = (string) preg_replace( '|^(https?://)?(.*)$|i', '$1', $uri ) )
+                $uri = substr( $uri, strlen( $scheme ) );
+
+        // extract base and query from query or uri
         if ( strpos( $uri, '?' ) !== false ) {
-                $parts = explode( '?', $uri, 2 );
-                if ( 1 == count( $parts ) ) {
-                        $base = '?';
-                        $query = $parts[0];
-                } else {
-                        $base = $parts[0] . '?';
-                        $query = $parts[1];
-                }
-        } elseif ( !empty( $protocol ) || strpos( $uri, '=' ) === false ) {
+                list( $base, $query ) = explode( '?', $uri, 2 );
+                $base .= '?';
+        } elseif ( $scheme || strpos( $uri, '=' ) === false ) {
                 $base = $uri . '?';
                 $query = '';
         } else {
@@ -1432 +1423 @@
 
         wp_parse_str( $query, $qs );
         $qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
-        if ( is_array( func_get_arg( 0 ) ) ) {
-                $kayvees = func_get_arg( 0 );
-                $qs = array_merge( $qs, $kayvees );
-        } else {
-                $qs[func_get_arg( 0 )] = func_get_arg( 1 );
-        }
+        $qs = array_merge( $qs, $args[0] );
 
-        foreach ( (array) $qs as $k => $v ) {
-                if ( $v === false )
-                        unset( $qs[$k] );
-        }
+        // remove all entries === false
+        if ( $del = array_keys( $qs, false, true ) )
+                $qs = array_diff_key( $qs, array_flip( $del ) );
 
         $ret = build_query( $qs );
         $ret = trim( $ret, '?' );
         $ret = preg_replace( '#=(&|$)#', '$1', $ret );
-        $ret = $protocol . $base . $ret . $frag;
+        $ret = $scheme . $base . $ret . $fragment;
         $ret = rtrim( $ret, '?' );
         return $ret;
 }
@@ -1458 +1443 @@
  * @since 1.5.0
  *
  * @param string|array $key Query key or keys to remove.
- * @param bool $query When false uses the $_SERVER value.
+ * @param bool $query Optional. When false uses the $_SERVER value.
  * @return string New URL query string.
  */
-function remove_query_arg( $key, $query=false ) {
-        if ( is_array( $key ) ) { // removing multiple keys
-                foreach ( $key as $k )
-                        $query = add_query_arg( $k, false, $query );
-                return $query;
-        }
-        return add_query_arg( $key, false, $query );
+function remove_query_arg( $key, $query = false ) {
+        $key = (array) $key;
+        if ( $count = count( $key ) )
+                $key = array_combine( $key, array_fill( 0, $count, false ) );
+        return add_query_arg( $key, $query );
 }
 
 /**