From 679051e9b04760fbc15119800cd198a20f13d523 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 4 Jan 2011 07:26:57 +0000
Subject: [PATCH] Alter admin_notices usage in admin/includes/ms.php due to
 changes in the action with the network/user admin. props PeteMall, see
 #16063.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index b7f1c7367b..596c3b373a 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -575,7 +575,7 @@ function secret_salt_warning() {
 		echo "<div class='update-nag'>$msg</div>";
 	}
 }
-add_action( 'admin_notices', 'secret_salt_warning' );
+add_action( 'network_admin_notices', 'secret_salt_warning' );
 
 function site_admin_notice() {
 	global $wp_db_version;
@@ -585,6 +585,7 @@ function site_admin_notice() {
 		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
 }
 add_action( 'admin_notices', 'site_admin_notice' );
+add_action( 'network_admin_notices', 'site_admin_notice' );
 
 function avoid_blog_page_permalink_collision( $data, $postarr ) {
 	if ( is_subdomain_install() )
@@ -663,7 +664,7 @@ function ms_deprecated_blogs_file() {
 		return;
 	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' );
 
 /**
  * Grants super admin privileges.