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

Customize: Fix HTTPS navigation of site in preview on IE11. 

Accounts for HTTPS links (port 443) where [40318] only accounted for HTTP links (port 80). Addresses issue in IE11 where the default port number is unexpectedly included on `link.host` for links dynamically created by scripts.

Props mattwiebe.
Amends [40318], [38890].
See #38409.
Fixes #40198.

Merges [40381] to the 4.7 branch.

Built from https://develop.svn.wordpress.org/branches/4.7@40386


git-svn-id: http://core.svn.wordpress.org/branches/4.7@40293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2017-04-06 17:33:34 +00:00
parent de5181d97b
commit 2800ad60b0
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/customize-base.js
View File

@ -655,7 +655,7 @@ window.wp = window.wp || {};
var urlParser = document.createElement( 'a' ); var urlParser = document.createElement( 'a' );
urlParser.href = to; urlParser.href = to;
// Port stripping needed by IE since it adds to host but not to event.origin. // Port stripping needed by IE since it adds to host but not to event.origin.
return urlParser.protocol + '//' + urlParser.host.replace( /:80$/, '' ); return urlParser.protocol + '//' + urlParser.host.replace( /:(80|443)$/, '' );
}); });
// first add with no value // first add with no value

2
wp-includes/js/customize-base.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/customize-preview.js
View File

@ -286,11 +286,11 @@
return false; return false;
} }
elementHost = element.host.replace( /:80$/, '' ); elementHost = element.host.replace( /:(80|443)$/, '' );
parsedAllowedUrl = document.createElement( 'a' ); parsedAllowedUrl = document.createElement( 'a' );
matchesAllowedUrl = ! _.isUndefined( _.find( api.settings.url.allowed, function( allowedUrl ) { matchesAllowedUrl = ! _.isUndefined( _.find( api.settings.url.allowed, function( allowedUrl ) {
parsedAllowedUrl.href = allowedUrl; parsedAllowedUrl.href = allowedUrl;
return parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host.replace( /:80$/, '' ) === elementHost && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) ); return parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host.replace( /:(80|443)$/, '' ) === elementHost && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) );
} ) ); } ) );
if ( ! matchesAllowedUrl ) { if ( ! matchesAllowedUrl ) {
return false; return false;

2
wp-includes/js/customize-preview.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7.4-alpha-40385'; $wp_version = '4.7.4-alpha-40386';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.