Index: wp-content/blogs.php =================================================================== --- wp-content/blogs.php (revision 12932) +++ wp-content/blogs.php (working copy) @@ -1,130 +1,17 @@ archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) { - status_header( 404 ); - die('404 — File not found.'); -} +define( 'SHORTINIT', true ); +require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); -if ( !function_exists('wp_check_filetype') ) : -function wp_check_filetype($filename, $mimes = null) { - // Accepted MIME types are set here as PCRE unless provided. - $mimes = is_array($mimes) ? $mimes : array ( - 'jpg|jpeg|jpe' => 'image/jpeg', - 'gif' => 'image/gif', - 'png' => 'image/png', - 'bmp' => 'image/bmp', - 'tif|tiff' => 'image/tiff', - 'ico' => 'image/x-icon', - 'asf|asx|wax|wmv|wmx' => 'video/asf', - 'avi' => 'video/avi', - 'mov|qt' => 'video/quicktime', - 'mpeg|mpg|mpe' => 'video/mpeg', - 'txt|c|cc|h' => 'text/plain', - 'rtx' => 'text/richtext', - 'css' => 'text/css', - 'htm|html' => 'text/html', - 'mp3|mp4' => 'audio/mpeg', - 'ra|ram' => 'audio/x-realaudio', - 'wav' => 'audio/wav', - 'ogg' => 'audio/ogg', - 'mid|midi' => 'audio/midi', - 'wma' => 'audio/wma', - 'rtf' => 'application/rtf', - 'js' => 'application/javascript', - 'pdf' => 'application/pdf', - 'doc' => 'application/msword', - 'pot|pps|ppt' => 'application/vnd.ms-powerpoint', - 'wri' => 'application/vnd.ms-write', - 'xla|xls|xlt|xlw' => 'application/vnd.ms-excel', - 'mdb' => 'application/vnd.ms-access', - 'mpp' => 'application/vnd.ms-project', - 'swf' => 'application/x-shockwave-flash', - 'class' => 'application/java', - 'tar' => 'application/x-tar', - 'zip' => 'application/zip', - 'gz|gzip' => 'application/x-gzip', - 'exe' => 'application/x-msdownload' - ); +_deprecated_file( basename( __FILE__ ), '3.0', null, sprintf( __( 'Change your rewrite rules to use %1$s instead of %2$s.' ), 'wp-includes/ms-files.php', 'wp-content/blogs.php' ) ); - $type = false; - $ext = false; +/** Load Multisite upload handler. */ +require_once( ABSPATH . WPINC . '/ms-files.php' ); - foreach ( (array)$mimes as $ext_preg => $mime_match ) { - $ext_preg = '!\.(' . $ext_preg . ')$!i'; - if ( preg_match($ext_preg, $filename, $ext_matches) ) { - $type = $mime_match; - $ext = $ext_matches[1]; - break; - } - } - - return compact('ext', 'type'); -} -endif; - -$file = BLOGUPLOADDIR . str_replace( '..', '', $_GET[ 'file' ] ); -if ( !is_file( $file ) ) { - status_header( 404 ); - die('404 — File not found.'); -} - -$mime = wp_check_filetype( $_SERVER[ 'REQUEST_URI' ] ); -if( $mime[ 'type' ] === false && function_exists( 'mime_content_type' ) ) - $mime[ 'type' ] = mime_content_type( $file ); - -if( $mime[ 'type' ] != false ) { - $mimetype = $mime[ 'type' ]; -} else { - $ext = substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 ); - $mimetype = "image/$ext"; -} -@header( 'Content-type: ' . $mimetype ); // always send this -if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) - @header( 'Content-Length: ' . filesize( $file ) ); - -// Optional support for X-Sendfile and X-Accel-Redirect -if ( defined('WPMU_ACCEL_REDIRECT') && WPMU_ACCEL_REDIRECT ) { - @header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) ); - exit; -} elseif ( defined('WPMU_SENDFILE') && WPMU_SENDFILE ) { - @header( 'X-Sendfile: ' . $file ); - exit; -} - -$last_modified = gmdate('D, d M Y H:i:s', filemtime( $file )); -$etag = '"' . md5($last_modified) . '"'; -@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 -if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) - $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']); -else - $client_etag = false; - -if( !isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) - $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false; -$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']); -// If string is empty, return 0. If not, attempt to parse into a timestamp -$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0; - -// Make a timestamp for our most recent modification... -$modified_timestamp = strtotime($last_modified); - -if ( ($client_last_modified && $client_etag) ? - (($client_modified_timestamp >= $modified_timestamp) && ($client_etag == $etag)) : - (($client_modified_timestamp >= $modified_timestamp) || ($client_etag == $etag)) ) { - status_header( 304 ); - exit; -} - -// If we made it this far, just serve the file - -readfile( $file ); - -?> +?> \ No newline at end of file Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 12962) +++ wp-includes/functions.php (working copy) @@ -3059,24 +3059,26 @@ * @access private * * @uses do_action() Calls 'deprecated_file_included' and passes the file name, what to use instead, - * and the version in which the file was deprecated. + * the version in which the file was deprecated, and any message regarding the change. * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do * trigger or false to not trigger error. * * @param string $file The file that was included * @param string $version The version of WordPress that deprecated the file * @param string $replacement Optional. The file that should have been included based on ABSPATH + * @param string $message Optional. A message regarding the change */ -function _deprecated_file( $file, $version, $replacement = null ) { +function _deprecated_file( $file, $version, $replacement = null, $message = '' ) { - do_action( 'deprecated_file_included', $file, $replacement, $version ); + do_action( 'deprecated_file_included', $file, $replacement, $version, $message ); // Allow plugin to filter the output error trigger if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) { + $message = empty( $message ) ? '' : ' ' . $message; if ( ! is_null( $replacement ) ) - trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) ); + trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message ); else - trigger_error( sprintf( __('%1$s is deprecated since version %2$s with no alternative available.'), $file, $version ) ); + trigger_error( sprintf( __('%1$s is deprecated since version %2$s with no alternative available.'), $file, $version ) . $message ); } } /** Index: wp-includes/ms-files.php =================================================================== --- wp-includes/ms-files.php (revision 12962) +++ wp-includes/ms-files.php (working copy) @@ -1,6 +1,6 @@