Customize: Fix logic inversion in determining whether a URL is previewable which prevented previewing anything but homepage.
Fixes regression introduced in [38890]. See #38409. Fixes #38492. Built from https://develop.svn.wordpress.org/trunk@38926 git-svn-id: http://core.svn.wordpress.org/trunk@38869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
2f263fce99
commit
54465a68db
|
@ -4173,7 +4173,7 @@
|
||||||
_.find( parsedCandidateUrls, function( parsedCandidateUrl ) {
|
_.find( parsedCandidateUrls, function( parsedCandidateUrl ) {
|
||||||
return ! _.isUndefined( _.find( previewer.allowedUrls, function( allowedUrl ) {
|
return ! _.isUndefined( _.find( previewer.allowedUrls, function( allowedUrl ) {
|
||||||
parsedAllowedUrl.href = allowedUrl;
|
parsedAllowedUrl.href = allowedUrl;
|
||||||
if ( urlParser.protocol === parsedAllowedUrl.protocol && urlParser.host === parsedAllowedUrl.host && 0 === parsedAllowedUrl.pathname.indexOf( urlParser.pathname ) ) {
|
if ( urlParser.protocol === parsedAllowedUrl.protocol && urlParser.host === parsedAllowedUrl.host && 0 === urlParser.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) ) ) {
|
||||||
result = parsedCandidateUrl.href;
|
result = parsedCandidateUrl.href;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -297,7 +297,7 @@
|
||||||
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 === element.host && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname );
|
return parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host === element.host && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) );
|
||||||
} ) );
|
} ) );
|
||||||
if ( ! matchesAllowedUrl ) {
|
if ( ! matchesAllowedUrl ) {
|
||||||
return false;
|
return false;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.7-alpha-38925';
|
$wp_version = '4.7-alpha-38926';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
|
Loading…
Reference in New Issue