Changeset 12753 for trunk/wp-admin/includes/update.php

Timestamp:

01/18/2010 10:21:36 PM (15 years ago)

Author:

ryan

Message:

Use cap checks instead of multisite and super admin checks. Add some new caps. Merge cleanup. see #11644.

File:

• trunk/wp-admin/includes/update.php (modified) (11 diffs)

trunk/wp-admin/includes/update.php

@@ -83 +83 @@
 
 function core_update_footer( $msg = '' ) {
-    if ( is_multisite() && !is_super_admin() )
-        return false;
-
-    if ( !current_user_can('manage_options') )
+    if ( is_multisite() && !current_user_can('update_core') )
+        return false;
+
+    if ( !current_user_can('update_core') )
         return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
 
@@ -105 +105 @@
 
     case 'upgrade' :
-        if ( current_user_can('manage_options') ) {
-            return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
-            break;
-        }
+        return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
+    break;
 
     case 'latest' :
@@ -119 +117 @@
 
 function update_nag() {
-    if ( is_multisite() && !is_super_admin() )
+    if ( is_multisite() && !current_user_can('update_core') )
         return false;
 
@@ -132 +130 @@
         return false;
 
-    if ( current_user_can('manage_options') )
+    if ( current_user_can('update_core') )
         $msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
     else
@@ -143 +141 @@
 // Called directly from dashboard
 function update_right_now_message() {
-    if ( is_multisite() && !is_super_admin() )
+    if ( is_multisite() && !current_user_can('update_core') )
         return false;
 
@@ -149 +147 @@
 
     $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
-    if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') )
+    if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') )
         $msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
 
@@ -170 +168 @@
 
 function wp_plugin_update_rows() {
+    if ( !current_user_can('update_plugins' ) )
+        return;
+
     $plugins = get_site_transient( 'update_plugins' );
     if ( isset($plugins->response) && is_array($plugins->response) ) {
@@ -206 +207 @@
 
 function wp_update_plugin($plugin, $feedback = '') {
-    if ( is_multisite() && !is_super_admin() )
-        return false;
-
-
     if ( !empty($feedback) )
         add_filter('update_feedback', $feedback);
@@ -235 +232 @@
 
 function wp_update_theme($theme, $feedback = '') {
-
     if ( !empty($feedback) )
         add_filter('update_feedback', $feedback);
@@ -246 +242 @@
 
 function wp_update_core($current, $feedback = '') {
-
     if ( !empty($feedback) )
         add_filter('update_feedback', $feedback);
@@ -261 +256 @@
         return false;
 
-    if ( current_user_can('manage_options') )
+    if ( current_user_can('update_core') )
         $msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
     else