Changeset 17603

Timestamp:

04/05/2011 05:13:04 PM (15 years ago)

Author:

ryan

Message:

Take out unnecessary compat functions from compat.php. Props hakre, ptahdunbar. see #16918

Location:

trunk

Files:

• wp-admin/includes/image-edit.php (modified) (1 diff)
• wp-admin/setup-config.php (modified) (1 diff)
• wp-includes/class-json.php (deleted)
• wp-includes/compat.php (deleted)
• wp-includes/functions.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/includes/image-edit.php

@@ -552 +552 @@
         // generate new filename
         $path = get_attached_file($post_id);
-        $path_parts = pathinfo52( $path );
+        $path_parts = pathinfo( $path );
         $filename = $path_parts['filename'];
         $suffix = time() . rand(100, 999);

trunk/wp-admin/setup-config.php

@@ -41 +41 @@
 
 require_once(ABSPATH . WPINC . '/load.php');
-require_once(ABSPATH . WPINC . '/compat.php');
 require_once(ABSPATH . WPINC . '/functions.php');
 require_once(ABSPATH . WPINC . '/class-wp-error.php');

trunk/wp-includes/functions.php

@@ -1369 +1369 @@
 function build_query( $data ) {
         return _http_build_query( $data, null, '&', '', false );
+}
+
+// from php.net (modified by Mark Jaquith to behave like the native PHP5 function)
+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);
 }
 

trunk/wp-settings.php

@@ -64 +64 @@
 
 // Load early WordPress files.
-require( ABSPATH . WPINC . '/compat.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp.php' );