From 111ac18adaf3bb3141781d729833c327deb812e5 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 28 Oct 2010 08:31:16 +0000 Subject: [PATCH] Don't show plugin update notifications outside of the network admin. props PeteMall, see #14435. git-svn-id: http://svn.automattic.com/wordpress/trunk@16037 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index 2ce2538c3..320d90019 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -192,13 +192,15 @@ function wp_plugin_update_row( $file, $plugin_data ) { $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); - echo '
'; - if ( ! current_user_can('update_plugins') ) - printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); - else if ( empty($r->package) ) - printf( __('There is a new version of %1$s available. View version %4$s details. Automatic upgrade is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); - else - printf( __('There is a new version of %1$s available. View version %4$s details or upgrade automatically.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) ); + if ( is_network_admin() || !is_multisite() ) { + echo '
'; + if ( ! current_user_can('update_plugins') ) + printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); + else if ( empty($r->package) ) + printf( __('There is a new version of %1$s available. View version %4$s details. Automatic upgrade is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); + else + printf( __('There is a new version of %1$s available. View version %4$s details or upgrade automatically.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) ); + } do_action( "in_plugin_update_message-$file", $plugin_data, $r );