WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the update_core, update_plugins and update_themes caps in update-core.php. fixes #15866. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-18 18:43:35 +00:00
parent afd6a5e453
commit 453fd478a1
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/menu.php
View File

@ -51,7 +51,7 @@ if ( is_multisite() ) {
$update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : ''; $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
$submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'install_plugins', 'update-core.php'); $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'update_core', 'update-core.php');
unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress); unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
} }

2
wp-admin/network/menu.php
View File

@ -61,7 +61,7 @@ if ( $theme_update_count )
$update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : ''; $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
$menu[30] = array(sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div'); $menu[30] = array(sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div');
$submenu[ 'upgrade.php' ][10] = array( __( 'Updates' ), 'install_plugins', 'update-core.php' ); $submenu[ 'upgrade.php' ][10] = array( __( 'Updates' ), 'update_core', 'update-core.php' );
$submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' ); $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress); unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);

19
wp-admin/update-core.php
View File

@ -14,7 +14,7 @@ if ( is_multisite() && ! is_network_admin() ) {
exit(); exit();
} }
if ( ! current_user_can( 'update_plugins' ) ) if ( ! current_user_can( 'update_core' ) )
wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
function list_core_update( $update ) { function list_core_update( $update ) {
@ -164,8 +164,10 @@ function core_upgrade_preamble() {
echo '<p>' . __( '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.' ) . '</p>'; echo '<p>' . __( '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.' ) . '</p>';
dismissed_updates(); dismissed_updates();
list_plugin_updates(); if ( current_user_can( 'update_plugins' ) )
list_theme_updates(); list_plugin_updates();
if ( current_user_can( 'update_themes' ) )
list_theme_updates();
do_action('core_upgrade_preamble'); do_action('core_upgrade_preamble');
echo '</div>'; echo '</div>';
} }
@ -406,9 +408,11 @@ add_contextual_help($current_screen,
); );
if ( 'upgrade-core' == $action ) { if ( 'upgrade-core' == $action ) {
wp_version_check(); wp_version_check();
require_once(ABSPATH . 'wp-admin/admin-header.php'); require_once(ABSPATH . 'wp-admin/admin-header.php');
core_upgrade_preamble(); core_upgrade_preamble();
} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) { } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
check_admin_referer('upgrade-core'); check_admin_referer('upgrade-core');
@ -429,6 +433,10 @@ if ( 'upgrade-core' == $action ) {
do_core_upgrade($reinstall); do_core_upgrade($reinstall);
} elseif ( 'do-plugin-upgrade' == $action ) { } elseif ( 'do-plugin-upgrade' == $action ) {
if ( ! current_user_can( 'update_plugins' ) )
wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
check_admin_referer('upgrade-core'); check_admin_referer('upgrade-core');
if ( isset( $_GET['plugins'] ) ) { if ( isset( $_GET['plugins'] ) ) {
@ -451,7 +459,12 @@ if ( 'upgrade-core' == $action ) {
echo '<h2>' . esc_html__('Update Plugins') . '</h2>'; echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>"; echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
echo '</div>'; echo '</div>';
} elseif ( 'do-theme-upgrade' == $action ) { } elseif ( 'do-theme-upgrade' == $action ) {
if ( ! current_user_can( 'update_themes' ) )
wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
check_admin_referer('upgrade-core'); check_admin_referer('upgrade-core');
if ( isset( $_GET['themes'] ) ) { if ( isset( $_GET['themes'] ) ) {