Changeset 13514

Timestamp:

02/28/2010 08:29:24 PM (15 years ago)

Author:

nacin

Message:

Remove wp-content/blogs.php and add deprecated warning for MU admins. fixes #11742

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-content/blogs.php (deleted)
• wp-includes/ms-files.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -772 +772 @@
 
 function show_post_thumbnail_warning() {
-    if ( false == is_super_admin() ) {
+    if ( ! is_super_admin() )
         return;
-    }
     $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
     if ( empty($mu_media_buttons[ 'image' ]) && current_theme_supports( 'post-thumbnails' ) ) {
@@ -782 +781 @@
 add_action( 'admin_notices', 'show_post_thumbnail_warning' );
 
+function ms_deprecated_blogs_file() {
+    if ( ! is_super_admin() )
+        return;
+    if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) )
+        return;
+    echo '<div id="update-nag">' . sprintf( __( 'The <code>%1$s</code> file is deprecated. Please remove it and update your server rewrite rules to use <code>%2$s</code> instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '</div>';
+}
+add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
+
 ?>

trunk/wp-includes/ms-files.php

@@ -9 +9 @@
  */
 
-if ( ! defined( 'SHORTINIT' ) ) {
-    define( 'SHORTINIT', true );
-    require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
-}
+define( 'SHORTINIT', true );
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-ms_file_constants( );
+ms_file_constants();
 
 error_reporting( 0 );