Changeset 31335

Timestamp:

02/05/2015 06:15:59 AM (12 years ago)

Author:

pento

Message:

Shiny Updates: If the current user is not allowed to install/update plugins, we should return a JSON error, so it can be used by the JS handlers.

See #29820

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (4 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2836 +2836 @@
  */
 function wp_ajax_install_plugin() {
-        if ( ! current_user_can( 'install_plugins' ) ) {
-                wp_die( __('You do not have sufficient permissions to install plugins on this site.') );
-        }
-
-        check_ajax_referer( 'updates' );
-
-        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-        include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-
         $status = array(
                 'install' => 'plugin',
@@ -2850 +2841 @@
         );
 
+        if ( ! current_user_can( 'install_plugins' ) ) {
+                $status['error'] = __( 'You do not have sufficient permissions to install plugins on this site.' );
+                wp_send_json_error( $status );
+        }
+
+        check_ajax_referer( 'updates' );
+
+        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+        include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+
         $api = plugins_api( 'plugin_information', array(
                 'slug'   => sanitize_key( $_POST['slug'] ),
@@ -2880 +2881 @@
  */
 function wp_ajax_update_plugin() {
-        if ( ! current_user_can( 'update_plugins' ) ) {
-                wp_die( __('You do not have sufficient permissions to install plugins on this site.') );
-        }
-
-        check_ajax_referer( 'updates' );
-
-        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-
         $plugin = urldecode( $_POST['plugin'] );
 
@@ -2896 +2889 @@
         );
 
+        if ( ! current_user_can( 'update_plugins' ) ) {
+                $status['error'] = __( 'You do not have sufficient permissions to update plugins on this site.' );
+                wp_send_json_error( $status );
+        }
+
+        check_ajax_referer( 'updates' );
+
+        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+
         $current = get_site_transient( 'update_plugins' );
         if ( empty( $current ) ) {