WordPress 3.4

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

diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index 2d68f11dcd0e2af48ce5de7e4717fe2c575e24ab..100ba2c6d19b14cf3eaae92aa4a667942c59034f 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.' );
 }
 
-$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.' );
@@ -80,4 +80,3 @@ if ( ( $client_last_modified && $client_etag )
 
 // If we made it this far, just serve the file
 readfile( $file );
-?>