Changeset 17215

Timestamp:

01/04/2011 07:26:57 AM (14 years ago)

Author:

nacin

Message:

Alter admin_notices usage in admin/includes/ms.php due to changes in the action with the network/user admin. props PeteMall, see #16063.

File:

• trunk/wp-admin/includes/ms.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -576 +576 @@
     }
 }
-add_action( 'admin_notices', 'secret_salt_warning' );
+add_action( 'network_admin_notices', 'secret_salt_warning' );
 
 function site_admin_notice() {
@@ -586 +586 @@
 }
 add_action( 'admin_notices', 'site_admin_notice' );
+add_action( 'network_admin_notices', 'site_admin_notice' );
 
 function avoid_blog_page_permalink_collision( $data, $postarr ) {
@@ -664 +665 @@
     echo '<div class="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' );
+add_action( 'network_admin_notices', 'ms_deprecated_blogs_file' );
 
 /**