WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-includes / ms-files.php

diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index 100ba2c6d19b14cf3eaae92aa4a667942c59034f..e5c1db3f892dd8a8a802653255408be29a307045 100644 (file)
--- a/wp-includes/ms-files.php
+++ b/wp-includes/ms-files.php
@@ -11,7 +11,7 @@
 define( 'SHORTINIT', true );
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if( !is_multisite() )
+if ( !is_multisite() )
        die( 'Multisite support not enabled' );
 
 ms_file_constants();
@@ -30,10 +30,10 @@ if ( !is_file( $file ) ) {
 }
 
 $mime = wp_check_filetype( $file );
-if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
+if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
        $mime[ 'type' ] = mime_content_type( $file );
 
-if( $mime[ 'type' ] )
+if ( $mime[ 'type' ] )
        $mimetype = $mime[ 'type' ];
 else
        $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
@@ -57,10 +57,10 @@ header( "Last-Modified: $last_modified GMT" );
 header( 'ETag: ' . $etag );
 header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
 
-// Support for Conditional GET
+// Support for Conditional GET - use stripslashes to avoid formatting.php dependency
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-if( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
        $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
 
 $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
@@ -80,3 +80,4 @@ if ( ( $client_last_modified && $client_etag )
 
 // If we made it this far, just serve the file
 readfile( $file );
+flush();