From 87e7c0cd966d5ce84792f2c72a1448aeb6e12c80 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Tue, 25 Oct 2016 20:52:58 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@38926 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/customize-controls.js | 2 +- src/wp-includes/js/customize-preview.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/js/customize-controls.js b/src/wp-admin/js/customize-controls.js index 90b8411fb6..b4e2223f45 100644 --- a/src/wp-admin/js/customize-controls.js +++ b/src/wp-admin/js/customize-controls.js @@ -4173,7 +4173,7 @@ _.find( parsedCandidateUrls, function( parsedCandidateUrl ) { return ! _.isUndefined( _.find( previewer.allowedUrls, function( 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; return true; } diff --git a/src/wp-includes/js/customize-preview.js b/src/wp-includes/js/customize-preview.js index f1bd852d0f..12da70f6ac 100644 --- a/src/wp-includes/js/customize-preview.js +++ b/src/wp-includes/js/customize-preview.js @@ -297,7 +297,7 @@ parsedAllowedUrl = document.createElement( 'a' ); matchesAllowedUrl = ! _.isUndefined( _.find( api.settings.url.allowed, function( 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 ) { return false;