WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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


Built from https://develop.svn.wordpress.org/trunk@32080


git-svn-id: http://core.svn.wordpress.org/trunk@32059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2015-04-08 17:27:26 +00:00
parent 54a6a8e137
commit 7aeea37d47
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/js/updates.js
View File

@ -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();

2
wp-admin/js/updates.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/update-core.php
View File

@ -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 . '&section=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 . '&section=changelog&TB_iframe=true&width=640&height=662');
$details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
$details = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta4-32079';
$wp_version = '4.2-beta4-32080';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.