WordPress.org

Make WordPress Core

Changeset 17215


Ignore:
Timestamp:
01/04/11 07:26:57 (4 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/ms.php

    r17085 r17215  
    576576    } 
    577577} 
    578 add_action( 'admin_notices', 'secret_salt_warning' ); 
     578add_action( 'network_admin_notices', 'secret_salt_warning' ); 
    579579 
    580580function site_admin_notice() { 
     
    586586} 
    587587add_action( 'admin_notices', 'site_admin_notice' ); 
     588add_action( 'network_admin_notices', 'site_admin_notice' ); 
    588589 
    589590function avoid_blog_page_permalink_collision( $data, $postarr ) { 
     
    664665    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>'; 
    665666} 
    666 add_action( 'admin_notices', 'ms_deprecated_blogs_file' ); 
     667add_action( 'network_admin_notices', 'ms_deprecated_blogs_file' ); 
    667668 
    668669/** 
Note: See TracChangeset for help on using the changeset viewer.