WP Merge to 4524

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@810 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 33 insertions, 33 deletions

diff --git a/wp-includes/compat.php b/wp-includes/compat.php
index 3b64dfb..997307f 100644
--- a/wp-includes/compat.php
+++ b/wp-includes/compat.php
@@ -36,13 +36,13 @@ if (!function_exists('ob_clean')) {
 /* Added in PHP 4.3.0 */
 
 function printr($var, $do_not_echo = false) {
-	// from php.net/print_r user contributed notes 
+	// from php.net/print_r user contributed notes
 	ob_start();
 	print_r($var);
 	$code =  htmlentities(ob_get_contents());
 	ob_clean();
 	if (!$do_not_echo) {
-	  echo "<pre>$code</pre>";
+		echo "<pre>$code</pre>";
 	}
 	ob_end_clean();
 	return $code;
@@ -57,11 +57,11 @@ if ( !function_exists('file_get_contents') ) {
 }
 
 if (!defined('CASE_LOWER')) {
-    define('CASE_LOWER', 0);
+		define('CASE_LOWER', 0);
 }
 
 if (!defined('CASE_UPPER')) {
-    define('CASE_UPPER', 1);
+		define('CASE_UPPER', 1);
 }
 
 
@@ -73,43 +73,43 @@ if (!defined('CASE_UPPER')) {
  * @link        http://php.net/function.array_change_key_case
  * @author      Stephan Schmidt <schst@php.net>
  * @author      Aidan Lister <aidan@php.net>
- * @version     $Revision: 3901 $
+ * @version     $Revision: 4495 $
  * @since       PHP 4.2.0
  * @require     PHP 4.0.0 (user_error)
  */
 if (!function_exists('array_change_key_case')) {
-    function array_change_key_case($input, $case = CASE_LOWER)
-    {
-        if (!is_array($input)) {
-            user_error('array_change_key_case(): The argument should be an array',
-                E_USER_WARNING);
-            return false;
-        }
-
-        $output   = array ();
-        $keys     = array_keys($input);
-        $casefunc = ($case == CASE_LOWER) ? 'strtolower' : 'strtoupper';
-
-        foreach ($keys as $key) {
-            $output[$casefunc($key)] = $input[$key];
-        }
-
-        return $output;
-    }
+		function array_change_key_case($input, $case = CASE_LOWER)
+		{
+				if (!is_array($input)) {
+						user_error('array_change_key_case(): The argument should be an array',
+								E_USER_WARNING);
+						return false;
+				}
+
+				$output   = array ();
+				$keys     = array_keys($input);
+				$casefunc = ($case == CASE_LOWER) ? 'strtolower' : 'strtoupper';
+
+				foreach ($keys as $key) {
+						$output[$casefunc($key)] = $input[$key];
+				}
+
+				return $output;
+		}
 }
 
 // From php.net
 if(!function_exists('http_build_query')) {
-   function http_build_query( $formdata, $numeric_prefix = null, $key = null ) {
-       $res = array();
-       foreach ((array)$formdata as $k=>$v) {
-           $tmp_key = urlencode(is_int($k) ? $numeric_prefix.$k : $k);
-           if ($key) $tmp_key = $key.'['.$tmp_key.']';
-           $res[] = ( ( is_array($v) || is_object($v) ) ? http_build_query($v, null, $tmp_key) : $tmp_key."=".urlencode($v) );
-       }
-       $separator = ini_get('arg_separator.output');
-       return implode($separator, $res);
-   }
+	 function http_build_query( $formdata, $numeric_prefix = null, $key = null ) {
+			 $res = array();
+			 foreach ((array)$formdata as $k=>$v) {
+					 $tmp_key = urlencode(is_int($k) ? $numeric_prefix.$k : $k);
+					 if ($key) $tmp_key = $key.'['.$tmp_key.']';
+					 $res[] = ( ( is_array($v) || is_object($v) ) ? http_build_query($v, null, $tmp_key) : $tmp_key."=".urlencode($v) );
+			 }
+			 $separator = ini_get('arg_separator.output');
+			 return implode($separator, $res);
+	 }
 }
 
 if ( !function_exists('_') ) {