Changeset 17048

Timestamp:

12/18/2010 06:43:35 PM (15 years ago)

Author:

nacin

Message:

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

Location:

trunk/wp-admin

Files:

• menu.php (modified) (1 diff)
• network/menu.php (modified) (1 diff)
• update-core.php (modified) (5 diffs)

trunk/wp-admin/menu.php

@@ -52 +52 @@
     $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);
 }

trunk/wp-admin/network/menu.php

@@ -62 +62 @@
 
 $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' );
 unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);

trunk/wp-admin/update-core.php

@@ -15 +15 @@
 }
 
-if ( ! current_user_can( 'update_plugins' ) )
+if ( ! current_user_can( 'update_core' ) )
     wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
 
@@ -165 +165 @@
     dismissed_updates();
 
-    list_plugin_updates();
-    list_theme_updates();
+    if ( current_user_can( 'update_plugins' ) )
+        list_plugin_updates();
+    if ( current_user_can( 'update_themes' ) )
+        list_theme_updates();
     do_action('core_upgrade_preamble');
     echo '</div>';
@@ -407 +409 @@
 
 if ( 'upgrade-core' == $action ) {
+
     wp_version_check();
     require_once(ABSPATH . 'wp-admin/admin-header.php');
     core_upgrade_preamble();
+
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
     check_admin_referer('upgrade-core');
@@ -430 +434 @@
 
 } 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');
 
@@ -452 +460 @@
     echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
     echo '</div>';
+
 } 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');