Changeset 38926

Timestamp:

10/25/2016 08:52:58 PM (9 years ago)

Author:

westonruter

Message:

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.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/js/customize-preview.js (modified) (1 diff)

trunk/src/wp-admin/js/customize-controls.js

@@ -4174 +4174 @@
                     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;

trunk/src/wp-includes/js/customize-preview.js

@@ -298 +298 @@
         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 ) {