From 7e4fa157a782f02e247f75d48c794240f7eea4ef Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Wed, 8 Apr 2015 17:26:05 +0000 Subject: [PATCH] Fix logic for details based shiny updates. This fixes two problems. TB seems to sometimes strip window.location.search variables after tb ones, so we need to move it forward. Also fixes logic error. See #31739 git-svn-id: https://develop.svn.wordpress.org/trunk@32080 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/updates.js | 2 +- src/wp-admin/update-core.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js index 3ad6b1c0d8..1c15f8d495 100644 --- a/src/wp-admin/js/updates.js +++ b/src/wp-admin/js/updates.js @@ -481,7 +481,7 @@ window.wp = window.wp || {}; target = window.parent == window ? null : window.parent, $.support.postMessage = !! window.postMessage; - if ( $.support.postMessage === false || target === null || window.location.search.indexOf( 'parent=update-core' ) === -1 ) + if ( $.support.postMessage === false || target === null || window.location.search.indexOf( 'parent=update-core' ) !== -1 ) return; e.preventDefault(); diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php index b03aca741f..538b7ca3b1 100644 --- a/src/wp-admin/update-core.php +++ b/src/wp-admin/update-core.php @@ -264,7 +264,7 @@ function list_plugin_updates() { $upgrade_notice = ''; } - $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662&parent=update-core'); + $details_url = self_admin_url('plugin-install.php?tab=plugin-information&parent=update-core&plugin=' . $plugin_data->update->slug . '§ion=changelog&TB_iframe=true&width=640&height=662'); $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); $details = sprintf('%3$s.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);