diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php index 8a0ee3c17f..e3d6da2fc3 100644 --- a/wp-admin/load-scripts.php +++ b/wp-admin/load-scripts.php @@ -30,8 +30,6 @@ require( ABSPATH . 'wp-admin/includes/noop.php' ); require( ABSPATH . WPINC . '/script-loader.php' ); require( ABSPATH . WPINC . '/version.php' ); -$compress = ( isset( $_GET['c'] ) && $_GET['c'] ); -$force_gzip = ( $compress && 'gzip' == $_GET['c'] ); $expires_offset = 31536000; // 1 year $out = ''; @@ -61,16 +59,5 @@ header( 'Content-Type: application/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' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) { - header( 'Vary: Accept-Encoding' ); // Handle proxies - if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) { - header( 'Content-Encoding: deflate' ); - $out = gzdeflate( $out, 3 ); - } elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) { - header( 'Content-Encoding: gzip' ); - $out = gzencode( $out, 3 ); - } -} - echo $out; exit; diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php index 82dacef60a..d6c5afc330 100644 --- a/wp-admin/load-styles.php +++ b/wp-admin/load-styles.php @@ -29,8 +29,6 @@ if ( empty( $load ) ) { exit; } -$compress = ( isset( $_GET['c'] ) && $_GET['c'] ); -$force_gzip = ( $compress && 'gzip' == $_GET['c'] ); $rtl = ( isset( $_GET['dir'] ) && 'rtl' == $_GET['dir'] ); $expires_offset = 31536000; // 1 year $out = ''; @@ -82,16 +80,5 @@ header( 'Content-Type: text/css; 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' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) { - header( 'Vary: Accept-Encoding' ); // Handle proxies - if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) { - header( 'Content-Encoding: deflate' ); - $out = gzdeflate( $out, 3 ); - } elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) { - header( 'Content-Encoding: gzip' ); - $out = gzencode( $out, 3 ); - } -} - echo $out; exit; diff --git a/wp-includes/version.php b/wp-includes/version.php index 75a5997ed7..08af2c4caa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43579'; +$wp_version = '5.0-alpha-43580'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.