WordPress 3.4

[autoinstalls/wordpress.git] / wp-admin / load-scripts.php

diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php
index 957a8cb480bd317fc35f10c32929fe630bef8290..065ea9c9acd13f45cb2e18a5edbf886e37bd309a 100644 (file)
--- a/wp-admin/load-scripts.php
+++ b/wp-admin/load-scripts.php
@@ -16,17 +16,11 @@ define( 'WPINC', 'wp-includes' );
  */
 function __() {}
 
-/**
- * @ignore
- */
-function _c() {}
-
 /**
  * @ignore
  */
 function _x() {}
 
-
 /**
  * @ignore
  */
@@ -82,11 +76,28 @@ function site_url() {}
  */
 function admin_url() {}
 
+/**
+ * @ignore
+ */
+function home_url() {}
+
+/**
+ * @ignore
+ */
+function includes_url() {}
+
 /**
  * @ignore
  */
 function wp_guess_url() {}
 
+if ( ! function_exists( 'json_encode' ) ) :
+/**
+ * @ignore
+ */
+function json_encode() {}
+endif;
+
 function get_file($path) {
 
        if ( function_exists('realpath') )
@@ -127,12 +138,12 @@ header('Content-Type: application/x-javascript; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) {
+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
        header('Vary: Accept-Encoding'); // Handle proxies
-       if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+       if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
                header('Content-Encoding: deflate');
                $out = gzdeflate( $out, 3 );
-       } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+       } elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
                header('Content-Encoding: gzip');
                $out = gzencode( $out, 3 );
        }