From 2f09b8d0a647bcf4912565f64acbae1670128f0e Mon Sep 17 00:00:00 2001
From: koopersmith <koopersmith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 24 May 2012 22:45:27 +0000
Subject: [PATCH] Theme Customizer: Fix hash-based loader fallbacks. see
 #20736, #19910, [20886].

git-svn-id: http://core.svn.wordpress.org/trunk@20890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/customize-loader.dev.js | 8 +++++---
 wp-includes/theme.php                  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-includes/js/customize-loader.dev.js b/wp-includes/js/customize-loader.dev.js
index 095d264dce..b33a7e0e09 100644
--- a/wp-includes/js/customize-loader.dev.js
+++ b/wp-includes/js/customize-loader.dev.js
@@ -40,8 +40,10 @@ if ( typeof wp === 'undefined' )
 			if ( $.support.history )
 				this.window.on( 'popstate', Loader.popstate );
 
-			if ( $.support.hashchange )
+			if ( $.support.hashchange ) {
 				this.window.on( 'hashchange', Loader.hashchange );
+				this.window.triggerHandler( 'hashchange' );
+			}
 		},
 
 		popstate: function( e ) {
@@ -56,7 +58,7 @@ if ( typeof wp === 'undefined' )
 			var hash = window.location.toString().split('#')[1];
 
 			if ( hash && 0 === hash.indexOf( 'customize=on' ) )
-				Loader.open( wpCustomizeLoaderL10n.url + '?' + hash );
+				Loader.open( Loader.settings.url + '?' + hash );
 
 			if ( ! hash && ! $.support.history )
 				Loader.close();
@@ -97,7 +99,7 @@ if ( typeof wp === 'undefined' )
 			if ( $.support.history && window.location.href !== src )
 				history.pushState( { customize: src }, '', src );
 			else if ( ! $.support.history && $.support.hashchange && hash )
-				window.location.hash = hash;
+				window.location.hash = 'customize=on&' + hash;
 
 			this.trigger( 'open' );
 		},
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index fc2b4efc2d..fb9fc04eef 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1596,7 +1596,7 @@ function _wp_customize_loader_settings() {
 	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
 
 	$settings = array(
-		'url'           => esc_url( admin_url( 'admin.php' ) ),
+		'url'           => esc_url( admin_url( 'customize.php' ) ),
 		'isCrossDomain' => $cross_domain,
 	);