From f855a18bc10b96fdb09db9bc45fc433cbb362612 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 6 Sep 2011 15:41:57 +0000
Subject: [PATCH] trailingslashit isn't normally available in ms-files. props
 davecpage, fixes #18592.

git-svn-id: http://svn.automattic.com/wordpress/trunk@18642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index 4c09cddda..e7ab0a4cc 100644
--- 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 &#8212; File not found.' );
 }
 
-$file = trailingslashit( BLOGUPLOADDIR ) . str_replace( '..', '', $_GET[ 'file' ] );
+$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
 if ( !is_file( $file ) ) {
 	status_header( 404 );
 	die( '404 &#8212; File not found.' );