From f89f0a284d0a3909f224019f322f3899ae0d3816 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Tue, 5 Jul 2016 15:36:43 +0000 Subject: [PATCH] Update/Install: Fix plugin updates from the details modal on the Dashboard. The plugin details modal has been greatly improved in [37714]. However, Shiny Updates aren't yet implemented on the Dashboard. Therefore, we need to fall back to The Bleak Screen of Sadness. Otherwise nothing happens when trying to install an update from inside the modal. Fixes #37131. See #37126. git-svn-id: https://develop.svn.wordpress.org/trunk@37974 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/index.php | 4 +++- src/wp-admin/js/updates.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/index.php b/src/wp-admin/index.php index c96e6f2179..86bed0adfc 100644 --- a/src/wp-admin/index.php +++ b/src/wp-admin/index.php @@ -17,8 +17,10 @@ wp_dashboard_setup(); wp_enqueue_script( 'dashboard' ); if ( current_user_can( 'edit_theme_options' ) ) wp_enqueue_script( 'customize-loader' ); -if ( current_user_can( 'install_plugins' ) ) +if ( current_user_can( 'install_plugins' ) ) { wp_enqueue_script( 'plugin-install' ); + wp_enqueue_script( 'updates' ); +} if ( current_user_can( 'upload_files' ) ) wp_enqueue_script( 'media-upload' ); add_thickbox(); diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js index 37291e0a3d..70193421bd 100644 --- a/src/wp-admin/js/updates.js +++ b/src/wp-admin/js/updates.js @@ -2111,7 +2111,7 @@ $.support.postMessage = !! window.postMessage; - if ( false === $.support.postMessage || null === target ) { + if ( false === $.support.postMessage || null === target || -1 !== window.parent.location.pathname.indexOf( 'index.php' ) ) { return; }