### Eclipse Workspace Patch 1.0
#P wordpress-trunk bare
Index: wp-includes/class-http.php
===================================================================
--- wp-includes/class-http.php	(revision 17523)
+++ wp-includes/class-http.php	(working copy)
@@ -293,10 +293,7 @@
 			$transports = WP_Http::_getTransport( $r );
 		} else {
 			if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
-				if ( ! version_compare(phpversion(), '5.1.2', '>=') )
-					$r['body'] = _http_build_query( $r['body'], null, '&' );
-				else
-					$r['body'] = http_build_query( $r['body'], null, '&' );
+				$r['body'] = http_build_query( $r['body'], null, '&' );
 				$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
 				$r['headers']['Content-Length'] = strlen( $r['body'] );
 			}
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 17523)
+++ wp-includes/functions.php	(working copy)
@@ -1355,9 +1355,9 @@
  * Build URL query based on an associative and, or indexed array.
  *
  * This is a convenient function for easily building url queries. It sets the
- * separator to '&' and uses _http_build_query() function.
+ * separator to '&' and uses http_build_query() function.
  *
- * @see _http_build_query() Used to build the query
+ * @see http_build_query() Used to build the query
  * @link http://us2.php.net/manual/en/function.http-build-query.php more on what
  *		http_build_query() does.
  *
@@ -1367,7 +1367,7 @@
  * @return string URL encoded string
  */
 function build_query( $data ) {
-	return _http_build_query( $data, null, '&', '', false );
+	return http_build_query( $data, null, '&', '', false );
 }
 
 /**
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 17523)
+++ wp-admin/setup-config.php	(working copy)
@@ -40,7 +40,6 @@
 /**#@-*/
 
 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');
 require_once(ABSPATH . WPINC . '/version.php');
Index: wp-includes/compat.php
===================================================================
--- wp-includes/compat.php	(revision 17523)
+++ wp-includes/compat.php	(working copy)
@@ -1,170 +0,0 @@
-<?php
-/**
- * WordPress implementation for PHP functions missing from older PHP versions.
- *
- * @package PHP
- * @access private
- */
-
-// Added in PHP 5.0
-
-if (!function_exists('http_build_query')) {
-	function http_build_query($data, $prefix=null, $sep=null) {
-		return _http_build_query($data, $prefix, $sep);
-	}
-}
-
-// 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);
-}
-
-if ( !function_exists('_') ) {
-	function _($string) {
-		return $string;
-	}
-}
-
-if (!function_exists('stripos')) {
-	function stripos($haystack, $needle, $offset = 0) {
-		return strpos(strtolower($haystack), strtolower($needle), $offset);
-	}
-}
-
-if ( !function_exists('hash_hmac') ):
-function hash_hmac($algo, $data, $key, $raw_output = false) {
-	return _hash_hmac($algo, $data, $key, $raw_output);
-}
-endif;
-
-function _hash_hmac($algo, $data, $key, $raw_output = false) {
-	$packs = array('md5' => 'H32', 'sha1' => 'H40');
-
-	if ( !isset($packs[$algo]) )
-		return false;
-
-	$pack = $packs[$algo];
-
-	if (strlen($key) > 64)
-		$key = pack($pack, $algo($key));
-
-	$key = str_pad($key, 64, chr(0));
-
-	$ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
-	$opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
-
-	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
-
-	if ( $raw_output )
-		return pack( $pack, $hmac );
-	return $hmac;
-}
-
-if ( !function_exists('mb_substr') ):
-	function mb_substr( $str, $start, $length=null, $encoding=null ) {
-		return _mb_substr($str, $start, $length, $encoding);
-	}
-endif;
-
-function _mb_substr( $str, $start, $length=null, $encoding=null ) {
-	// the solution below, works only for utf-8, so in case of a different
-	// charset, just use built-in substr
-	$charset = get_option( 'blog_charset' );
-	if ( !in_array( $charset, array('utf8', 'utf-8', 'UTF8', 'UTF-8') ) ) {
-		return is_null( $length )? substr( $str, $start ) : substr( $str, $start, $length);
-	}
-	// use the regex unicode support to separate the UTF-8 characters into an array
-	preg_match_all( '/./us', $str, $match );
-	$chars = is_null( $length )? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
-	return implode( '', $chars );
-}
-
-if ( !function_exists( 'htmlspecialchars_decode' ) ) {
-	// Added in PHP 5.1.0
-	// Error checks from PEAR::PHP_Compat
-	function htmlspecialchars_decode( $string, $quote_style = ENT_COMPAT )
-	{
-		if ( !is_scalar( $string ) ) {
-			trigger_error( 'htmlspecialchars_decode() expects parameter 1 to be string, ' . gettype( $string ) . ' given', E_USER_WARNING );
-			return;
-		}
-
-		if ( !is_int( $quote_style ) && $quote_style !== null ) {
-			trigger_error( 'htmlspecialchars_decode() expects parameter 2 to be integer, ' . gettype( $quote_style ) . ' given', E_USER_WARNING );
-			return;
-		}
-
-		return wp_specialchars_decode( $string, $quote_style );
-	}
-}
-
-// For PHP < 5.2.0
-if ( !function_exists('json_encode') ) {
-	function json_encode( $string ) {
-		global $wp_json;
-
-		if ( !is_a($wp_json, 'Services_JSON') ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
-			$wp_json = new Services_JSON();
-		}
-
-		return $wp_json->encodeUnsafe( $string );
-	}
-}
-
-if ( !function_exists('json_decode') ) {
-	function json_decode( $string, $assoc_array = false ) {
-		global $wp_json;
-
-		if ( !is_a($wp_json, 'Services_JSON') ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
-			$wp_json = new Services_JSON();
-		}
-
-		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
-		return $res;
-	}
-	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
-			$data = get_object_vars($data);
-		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
-	}
-}
-
-// pathinfo that fills 'filename' without extension like in PHP 5.2+
-function pathinfo52($path) {
-	$parts = pathinfo($path);
-	if ( !isset($parts['filename']) ) {
-		$parts['filename'] = substr( $parts['basename'], 0, strrpos($parts['basename'], '.') );
-		if ( empty($parts['filename']) ) // there's no extension
-			$parts['filename'] = $parts['basename'];
-	}
-	return $parts;
-}
Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 17523)
+++ wp-settings.php	(working copy)
@@ -63,7 +63,6 @@
 wp_set_lang_dir();
 
 // Load early WordPress files.
-require( ABSPATH . WPINC . '/compat.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp.php' );
 require( ABSPATH . WPINC . '/class-wp-error.php' );
Index: wp-admin/includes/image-edit.php
===================================================================
--- wp-admin/includes/image-edit.php	(revision 17523)
+++ wp-admin/includes/image-edit.php	(working copy)
@@ -551,7 +551,7 @@
 
 	// 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);