Changeset 21197

Timestamp:

06/30/2012 12:19:13 PM (14 years ago)

Author:

nacin

Message:

Cap checks for links in the upgrader, for plugins. fixes #19824.

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1196 +1196 @@
                         'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
                 );
-                if ( $this->plugin_active )
-                        unset( $update_actions['activate_plugin'] );
-                if ( ! $this->result || is_wp_error($this->result) )
+                if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
                         unset( $update_actions['activate_plugin'] );
 
@@ -1450 +1448 @@
 
                 if ( ! $this->result || is_wp_error($this->result) ) {
+                        unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
+                } elseif ( ! current_user_can( 'activate_plugins' ) ) {
                         unset( $install_actions['activate_plugin'] );
-                        unset( $install_actions['network_activate'] );
-                }
+                }
+
                 $install_actions = apply_filters('install_plugin_complete_actions', $install_actions, $this->api, $plugin_file);
                 if ( ! empty($install_actions) )