WordPress 4.2.4-scripts

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

diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index 2d68f11dcd0e2af48ce5de7e4717fe2c575e24ab..de6d15dbdd1205881758440f8a1bcab13dcd7230 100644 (file)
--- a/wp-includes/ms-files.php
+++ b/wp-includes/ms-files.php
@@ -23,7 +23,7 @@ if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_bl
        die( '404 — File not found.' );
 }
 
        die( '404 — File not found.' );
 }
 

-$file = BLOGUPLOADDIR . str_replace( '..', '', $_GET[ 'file' ] );
+$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );

 if ( !is_file( $file ) ) {
        status_header( 404 );
        die( '404 — File not found.' );
 if ( !is_file( $file ) ) {
        status_header( 404 );
        die( '404 — File not found.' );


@@ -57,7 +57,7 @@ header( "Last-Modified: $last_modified GMT" );
 header( 'ETag: ' . $etag );
 header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' 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'] ) )
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
 if( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )


@@ -80,4 +80,3 @@ if ( ( $client_last_modified && $client_etag )
 
 // If we made it this far, just serve the file
 readfile( $file );
 
 // If we made it this far, just serve the file
 readfile( $file );

-?>