merge multisite wp-admin/includes except schema, See #11644

git-svn-id: https://develop.svn.wordpress.org/trunk@12726 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ron Rennick
2010-01-15 00:21:13 +00:00
parent 0e3e18c7f2
commit 542f2132ab
4 changed files with 45 additions and 9 deletions

View File

@@ -82,6 +82,9 @@ function find_core_update( $version, $locale ) {
}
function core_update_footer( $msg = '' ) {
if( is_multisite() && !is_super_admin() )
return false;
if ( !current_user_can('manage_options') )
return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
@@ -115,6 +118,9 @@ function core_update_footer( $msg = '' ) {
add_filter( 'update_footer', 'core_update_footer' );
function update_nag() {
if( is_multisite() && !is_super_admin() )
return false;
global $pagenow;
if ( 'update-core.php' == $pagenow )
@@ -136,6 +142,9 @@ add_action( 'admin_notices', 'update_nag', 3 );
// Called directly from dashboard
function update_right_now_message() {
if( is_multisite() && !is_super_admin() )
return false;
$cur = get_preferred_from_update_core();
$msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
@@ -196,6 +205,9 @@ function wp_plugin_update_row( $file, $plugin_data ) {
}
function wp_update_plugin($plugin, $feedback = '') {
if( is_multisite() && !is_super_admin() )
return false;
if ( !empty($feedback) )
add_filter('update_feedback', $feedback);