From bc3d44241d0f455ee83d84daea89b96a85ff7f13 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Tue, 9 Feb 2010 18:22:21 +0000 Subject: [PATCH] revert remove error_reporting from ms-files.php, remove _deprecated_file call from blogs.php, see #11742 git-svn-id: https://develop.svn.wordpress.org/trunk@13040 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-content/blogs.php | 2 -- wp-includes/ms-files.php | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-content/blogs.php b/wp-content/blogs.php index cde2e5e3a9..28ad272111 100644 --- a/wp-content/blogs.php +++ b/wp-content/blogs.php @@ -8,8 +8,6 @@ define( 'SHORTINIT', true ); require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); -/* l10n is not loaded on SHORTINIT */ -_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' ) ); /** Load Multisite upload handler. */ require_once( ABSPATH . WPINC . '/ms-files.php' ); diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php index 03c16c0cf7..ecec87c18d 100644 --- a/wp-includes/ms-files.php +++ b/wp-includes/ms-files.php @@ -15,6 +15,8 @@ if ( ! defined( 'SHORTINIT' ) ) { ms_default_constants( 'ms-files' ); +error_reporting( 0 ); + if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) { status_header( 404 ); die( '404 — File not found.' );