revert remove error_reporting from ms-files.php, remove _deprecated_file call from blogs.php, see #11742
git-svn-id: http://svn.automattic.com/wordpress/trunk@13040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
0ee2237e6c
commit
26d0ba4c75
|
@ -8,8 +8,6 @@
|
||||||
|
|
||||||
define( 'SHORTINIT', true );
|
define( 'SHORTINIT', true );
|
||||||
require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' );
|
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 <code>%1$s</code> instead of <code>%2$s</code>.', 'wp-includes/ms-files.php', 'wp-content/blogs.php' ) );
|
|
||||||
|
|
||||||
/** Load Multisite upload handler. */
|
/** Load Multisite upload handler. */
|
||||||
require_once( ABSPATH . WPINC . '/ms-files.php' );
|
require_once( ABSPATH . WPINC . '/ms-files.php' );
|
||||||
|
|
|
@ -15,6 +15,8 @@ if ( ! defined( 'SHORTINIT' ) ) {
|
||||||
|
|
||||||
ms_default_constants( 'ms-files' );
|
ms_default_constants( 'ms-files' );
|
||||||
|
|
||||||
|
error_reporting( 0 );
|
||||||
|
|
||||||
if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
|
if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
|
||||||
status_header( 404 );
|
status_header( 404 );
|
||||||
die( '404 — File not found.' );
|
die( '404 — File not found.' );
|
||||||
|
|
Loading…
Reference in New Issue