Index: src/wp-admin/includes/theme.php =================================================================== --- src/wp-admin/includes/theme.php (revision 25879) +++ src/wp-admin/includes/theme.php (working copy) @@ -111,7 +111,7 @@ function theme_update_available( $theme ) { static $themes_update; - if ( !current_user_can('update_themes' ) ) + if ( ! current_user_can( 'view_theme_updates' ) ) return; if ( !isset($themes_update) ) Index: src/wp-admin/includes/update.php =================================================================== --- src/wp-admin/includes/update.php (revision 25879) +++ src/wp-admin/includes/update.php (working copy) @@ -158,7 +158,7 @@ } function core_update_footer( $msg = '' ) { - if ( !current_user_can('update_core') ) + if ( ! current_user_can( 'view_core_updates' ) ) return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); $cur = get_preferred_from_update_core(); @@ -180,7 +180,11 @@ break; case 'upgrade' : - return sprintf( ''.__( 'Get Version %2$s' ).'', network_admin_url( 'update-core.php' ), $cur->current); + if ( current_user_can( 'update_core' ) ) { + return sprintf( ''.__( 'Get Version %2$s' ).'', network_admin_url( 'update-core.php' ), $cur->current); + } else { + return sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current ); + } break; case 'latest' : @@ -207,6 +211,8 @@ if ( current_user_can('update_core') ) { $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, network_admin_url( 'update-core.php' ) ); + } elseif ( current_user_can( 'view_core_updates' ) ) { + $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current ); } else { $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); } @@ -219,11 +225,16 @@ function update_right_now_message() { $msg = sprintf( __( 'You are using WordPress %s.' ), get_bloginfo( 'version', 'display' ) ); - if ( current_user_can('update_core') ) { + if ( current_user_can( 'view_core_updates' ) ) { $cur = get_preferred_from_update_core(); - if ( isset( $cur->response ) && $cur->response == 'upgrade' ) - $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) { + if ( current_user_can( 'update_core' ) ) { + $msg .= " " . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; + } else { + $msg .= ' ' . sprintf( __( 'WordPress %1$s is available! Please update now.' ), $cur->current ); + } + } } echo "$msg"; @@ -244,7 +255,7 @@ } function wp_plugin_update_rows() { - if ( !current_user_can('update_plugins' ) ) + if ( ! current_user_can( 'view_plugin_updates' ) ) return; $plugins = get_site_transient( 'update_plugins' ); Index: src/wp-admin/menu.php =================================================================== --- src/wp-admin/menu.php (revision 25879) +++ src/wp-admin/menu.php (working copy) @@ -34,12 +34,12 @@ $update_data = wp_get_update_data(); if ( ! is_multisite() ) { - if ( current_user_can( 'update_core' ) ) - $cap = 'update_core'; - elseif ( current_user_can( 'update_plugins' ) ) - $cap = 'update_plugins'; + if ( current_user_can( 'view_core_updates' ) ) + $cap = 'view_core_updates'; + elseif ( current_user_can( 'view_plugin_updates' ) ) + $cap = 'view_plugin_updates'; else - $cap = 'update_themes'; + $cap = 'view_theme_updates'; $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "" . number_format_i18n($update_data['counts']['total']) . "" ), $cap, 'update-core.php'); unset( $cap ); } @@ -155,7 +155,7 @@ } $count = ''; -if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) { +if ( ! is_multisite() && current_user_can( 'view_plugin_updates' ) ) { if ( ! isset( $update_data ) ) $update_data = wp_get_update_data(); $count = "" . number_format_i18n($update_data['counts']['plugins']) . ""; @@ -167,7 +167,7 @@ if ( ! is_multisite() ) { /* translators: add new plugin */ - $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' ); + $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'view_plugin_updates', 'plugin-install.php' ); $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' ); } Index: src/wp-admin/plugin-install.php =================================================================== --- src/wp-admin/plugin-install.php (revision 25879) +++ src/wp-admin/plugin-install.php (working copy) @@ -14,8 +14,8 @@ */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! current_user_can('install_plugins') ) - wp_die(__('You do not have sufficient permissions to install plugins on this site.')); +if ( ! current_user_can( 'view_plugin_updates' ) ) + wp_die( __( 'You do not have sufficient permissions to view plugin updates for this site.' ) ); if ( is_multisite() && ! is_network_admin() ) { wp_redirect( network_admin_url( 'plugin-install.php' ) ); Index: src/wp-admin/update-core.php =================================================================== --- src/wp-admin/update-core.php (revision 25879) +++ src/wp-admin/update-core.php (working copy) @@ -18,8 +18,8 @@ exit(); } -if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) ) - wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); +if ( ! current_user_can( 'view_core_updates' ) && ! current_user_can( 'view_theme_updates' ) && ! current_user_can( 'view_plugin_updates' ) ) + wp_die( __( 'You do not have sufficient permissions to view updates for this site.' ) ); function list_core_update( $update ) { global $wp_local_package, $wpdb, $wp_version; @@ -62,8 +62,13 @@ $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); elseif ( !$mysql_compat ) $message = sprintf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); - else - $message = sprintf(__('You can update to WordPress %2$s automatically or download the package and install it manually:'), $update->current, $version_string); + else { + if ( current_user_can( 'update_core' ) ) { + $message = sprintf(__('You can update to WordPress %2$s automatically or download the package and install it manually:'), $update->current, $version_string); + } else { + $message = sprintf(__('WordPress %2$s is available. Please download the package and install it manually.'), $update->current, $version_string); + } + } if ( !$mysql_compat || !$php_compat ) $show_buttons = false; } @@ -79,13 +84,16 @@ echo ''; echo ''; if ( $show_buttons ) { - if ( $first_pass ) { - submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false ); - $first_pass = false; - } else { - submit_button( $submit, 'button', 'upgrade', false ); + if ( current_user_can( 'update_core' ) ) { + if ( $first_pass ) { + submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false ); + $first_pass = false; + } else { + submit_button( $submit, 'button', 'upgrade', false ); + } + echo ' '; } - echo ' ' . $download . ' '; + echo '' . $download . ' '; } if ( 'en_US' != $update->locale ) if ( !isset( $update->dismissed ) || !$update->dismissed ) @@ -186,7 +194,7 @@ } echo ''; // Don't show the maintenance mode notice when we are only showing a single re-install option. - if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) { + if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) && current_user_can( 'update_core' ) ) { echo '

' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '

'; } elseif ( ! $updates ) { list( $normalized_version ) = explode( '-', $wp_version ); @@ -216,24 +224,36 @@ $core_update_version = $core_updates[0]->current; ?>

-

-
- -

+

+ + + + +

+ + + + +

+ + - - - - - - + + + + + + + - - - - - - + + + + + + + + $plugin_data) { @@ -267,17 +287,34 @@ $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); $details = sprintf('%3$s.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text); - echo " - - - - "; + ?> + + + + + + +

{$plugin_data->Name}
" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . ' ' . $details . $compat . $upgrade_notice . "

+

+ Name ); ?>
+ Version ); ?> + + update->new_version ); ?> + + update->new_version ); ?> + + +

+
-

-
+ + +

+ +

-

+

+ + + + +

Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications.' ), __( 'http://codex.wordpress.org/Child_Themes' ) ); ?>

-
- -

+ + + + +

+ + - - - - - - + + + + + + + + + + + + + + + - - - - - - $theme ) { - echo " - - - - "; + ?> + + + + + + +
" . $theme->display('Name') . ' ' . sprintf( __( 'You have version %1$s installed. Update to %2$s.' ), $theme->display('Version'), $theme->update['new_version'] ) . "
+ + display('Name') ); ?> + display( 'Version' ) ) ); ?> + + + update['new_version'] ) ); ?> + + update['new_version'] ) ); ?> + +
-

-
+ + +

+ + ' . __( 'Check Again' ) . ''; echo '

'; - if ( $core = current_user_can( 'update_core' ) ) + if ( $core = current_user_can( 'view_core_updates' ) ) core_upgrade_preamble(); - if ( $plugins = current_user_can( 'update_plugins' ) ) + if ( $plugins = current_user_can( 'view_plugin_updates' ) ) list_plugin_updates(); - if ( $themes = current_user_can( 'update_themes' ) ) + if ( $themes = current_user_can( 'view_theme_updates' ) ) list_theme_updates(); if ( $core || $plugins || $themes ) list_translation_updates(); @@ -525,8 +590,8 @@ } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) { - if ( ! current_user_can( 'update_core' ) ) - wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); + if ( ! current_user_can( 'view_core_updates' ) ) + wp_die( __( 'You do not have sufficient permissions to view updates for this site.' ) ); check_admin_referer('upgrade-core'); @@ -550,8 +615,8 @@ } elseif ( 'do-plugin-upgrade' == $action ) { - if ( ! current_user_can( 'update_plugins' ) ) - wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); + if ( ! current_user_can( 'view_plugin_updates' ) ) + wp_die( __( 'You do not have sufficient permissions to view updates for this site.' ) ); check_admin_referer('upgrade-core'); @@ -579,8 +644,8 @@ } elseif ( 'do-theme-upgrade' == $action ) { - if ( ! current_user_can( 'update_themes' ) ) - wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); + if ( ! current_user_can( 'view_theme_updates' ) ) + wp_die( __( 'You do not have sufficient permissions to view updates for this site.' ) ); check_admin_referer('upgrade-core'); Index: src/wp-includes/capabilities.php =================================================================== --- src/wp-includes/capabilities.php (revision 25879) +++ src/wp-includes/capabilities.php (working copy) @@ -1228,6 +1228,14 @@ else $caps[] = $cap; break; + case 'view_plugin_updates': + case 'view_theme_updates': + case 'view_core_updates': + if ( is_multisite() && ! is_super_admin( $user_id ) ) + $caps[] = 'do_not_allow'; + else + $caps[] = 'manage_options'; + break; case 'activate_plugins': $caps[] = $cap; if ( is_multisite() ) { Index: src/wp-includes/update.php =================================================================== --- src/wp-includes/update.php (revision 25879) +++ src/wp-includes/update.php (working copy) @@ -450,21 +450,21 @@ function wp_get_update_data() { $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 ); - if ( $plugins = current_user_can( 'update_plugins' ) ) { + if ( $plugins = current_user_can( 'view_plugin_updates' ) ) { $update_plugins = get_site_transient( 'update_plugins' ); if ( ! empty( $update_plugins->response ) ) $counts['plugins'] = count( $update_plugins->response ); } - if ( $themes = current_user_can( 'update_themes' ) ) { + if ( $themes = current_user_can( 'view_theme_updates' ) ) { $update_themes = get_site_transient( 'update_themes' ); if ( ! empty( $update_themes->response ) ) $counts['themes'] = count( $update_themes->response ); } - if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) { + if ( ( $core = current_user_can( 'view_core_updates' ) ) && function_exists( 'get_core_updates' ) ) { $update_wordpress = get_core_updates( array('dismissed' => false) ); - if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') ) + if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array( 'development', 'latest' ) ) && current_user_can( 'view_core_updates' ) ) $counts['wordpress'] = 1; }