Ticket #21121: 21121.diff

wp-includes/functions.php

@@ -584 +584 @@
  * @return string URL encoded string
  */
 function build_query( $data ) {
-        return _http_build_query( $data, null, '&', '', false );
+        return http_build_query( $data, null, '&', '', false );
 }
 
-// from php.net (modified by Mark Jaquith to behave like the native PHP5 function)
+/**
+ * Compatibility function for http_build_query
+ * Deprecated since PHP 5 is now a requirement
+ * @deprecated
+ * @param string $data
+ * @param string $prefix
+ * @param string $sep
+ * @param string $key
+ * @param bool $urlencode
+ * @return string
+ */
 function _http_build_query($data, $prefix=null, $sep=null, $key='', $urlencode=true) {
-        $ret = array();
-
-        foreach ( (array) $data as $k => $v ) {
-                if ( $urlencode)
-                        $k = urlencode($k);
-                if ( is_int($k) && $prefix != null )
-                        $k = $prefix.$k;
-                if ( !empty($key) )
-                        $k = $key . '%5B' . $k . '%5D';
-                if ( $v === null )
-                        continue;
-                elseif ( $v === FALSE )
-                        $v = '0';
-
-                if ( is_array($v) || is_object($v) )
-                        array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-                elseif ( $urlencode )
-                        array_push($ret, $k.'='.urlencode($v));
-                else
-                        array_push($ret, $k.'='.$v);
-        }
-
-        if ( null === $sep )
-                $sep = ini_get('arg_separator.output');
-
-        return implode($sep, $ret);
+        _deprecated_function( __FUNCTION__, '3.5', 'http_build_query' );
+        return http_build_query( $data, $prefix, $sep, $key, $urlencode );
 }
 
 /**