Changeset 25681

Timestamp:

10/03/2013 01:49:59 AM (11 years ago)

Author:

nacin

Message:

When determining a frontend, local URL in the theme customizer, match the home URL without a trailing slash.

props SergeyBiryukov.
fixes #25315.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (2 diffs)

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

@@ -554 +554 @@
                 // Check for URLs that include "/wp-admin/" or end in "/wp-admin".
                 // Strip hashes and query strings before testing.
-                if ( /\/wp-admin(\/|$)/.test( to.replace(/[#?].*$/, '') ) )
+                if ( /\/wp-admin(\/|$)/.test( to.replace( /[#?].*$/, '' ) ) )
                     return null;
 
@@ -561 +561 @@
                 $.each([ to.replace( rscheme, self.scheme() ), to ], function( i, url ) {
                     $.each( self.allowedUrls, function( i, allowed ) {
-                        if ( 0 === url.indexOf( allowed ) ) {
+                        var path;
+
+                        allowed = allowed.replace( /\/+$/, '' );
+                        path = url.replace( allowed, '' );
+
+                        if ( 0 === url.indexOf( allowed ) && /^([/#?]|$)/.test( path ) ) {
                             result = url;
                             return false;