Changeset 21199

Timestamp:

06/30/2012 12:54:05 PM (14 years ago)

Author:

nacin

Message:

Allow the 'WordPress Updates' page to be accessible even if you cannot update core, as long as you can update plugins or themes. fixes #21124.

Location:

trunk/wp-admin

Files:

• menu.php (modified) (1 diff)
• update-core.php (modified) (4 diffs)

trunk/wp-admin/menu.php

@@ -35 +35 @@
 
 if ( ! is_multisite() ) {
-    $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), 'update_core',  'update-core.php');
+    if ( current_user_can( 'update_core' ) )
+        $cap = 'update_core';
+    elseif ( current_user_can( 'update_plugins' ) )
+        $cap = 'update_plugins';
+    else
+        $cap = 'update_themes';
+    $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), $cap, 'update-core.php');
+    unset( $cap );
 }
 

trunk/wp-admin/update-core.php

@@ -19 +19 @@
 }
 
-if ( ! current_user_can( 'update_core' ) )
+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.' ) );
 
@@ -135 +135 @@
 
     $updates = get_core_updates();
-?>
-    <div class="wrap">
-    <?php screen_icon('tools'); ?>
-    <h2><?php _e('WordPress Updates'); ?></h2>
-<?php
+
     if ( $upgrade_error ) {
         echo '<div class="error"><p>';
@@ -184 +180 @@
     }
     dismissed_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>';
 }
 
@@ -455 +444 @@
     wp_version_check();
     require_once(ABSPATH . 'wp-admin/admin-header.php');
-    core_upgrade_preamble();
+    ?>
+    <div class="wrap">
+    <?php screen_icon('tools'); ?>
+    <h2><?php _e('WordPress Updates'); ?></h2>
+    <?php
+    if ( current_user_can( 'update_core' ) )
+        core_upgrade_preamble();
+    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>';
     include(ABSPATH . 'wp-admin/admin-footer.php');
 
 } 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.' ) );
+
     check_admin_referer('upgrade-core');