Wordpress 3.2

[autoinstalls/wordpress.git] / wp-includes / compat.php

diff --git a/wp-includes/compat.php b/wp-includes/compat.php
index 0043865000503fe8465d007c325a427ac3e1094d..e84ba3c97d9d6cc9dbaca4a8c5badc06f50a85af 100644 (file)
--- a/wp-includes/compat.php
+++ b/wp-includes/compat.php
@@ -1,83 +1,19 @@
 <?php
 /**
- * WordPress implementation for PHP functions missing from older PHP versions.
+ * WordPress implementation for PHP functions either missing from older PHP versions or not included by default.
  *
  * @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 gettext isn't available
 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) {
-       $packs = array('md5' => 'H32', 'sha1' => 'H40');
-
-       if ( !isset($packs[$algo]) )
-               return false;
-
-       $pack = $packs[$algo];
-
-       if (strlen($key) > 64)
-               $key = pack($pack, $algo($key));
-       else if (strlen($key) < 64)
-               $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));
-
-       return $algo($opad . pack($pack, $algo($ipad . $data)));
-}
-endif;
-
-if ( ! function_exists('mb_substr') ):
+if ( !function_exists('mb_substr') ):
        function mb_substr( $str, $start, $length=null, $encoding=null ) {
                return _mb_substr($str, $start, $length, $encoding);
        }
@@ -96,23 +32,31 @@ function _mb_substr( $str, $start, $length=null, $encoding=null ) {
        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 ( !function_exists('hash_hmac') ):
+function hash_hmac($algo, $data, $key, $raw_output = false) {
+       return _hash_hmac($algo, $data, $key, $raw_output);
+}
+endif;
 
-               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;
-               }
+function _hash_hmac($algo, $data, $key, $raw_output = false) {
+       $packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-               return wp_specialchars_decode( $string, $quote_style );
-       }
-}
+       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;
+}