Get snapshot post id from current post

xwp · Mar 6, 2017 · 95e139b · 95e139b
1 parent 6a44a47
commit 95e139b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/js/compat/customize-snapshots.js b/js/compat/customize-snapshots.js
@@ -227,7 +227,7 @@
 			api.previewer.query = function() {
 				var retval = originalQuery.apply( this, arguments );
 
-				if ( ! _.isUndefined( CustomizerBrowserHistory ) ) {
+				if ( 'undefined' !== typeof CustomizerBrowserHistory ) {
 					retval.customize_preview_url_query_vars = JSON.stringify( CustomizerBrowserHistory.getQueryParams( location.href ) );
 				}
 

diff --git a/js/customize-snapshots.js b/js/customize-snapshots.js
@@ -967,7 +967,7 @@
 			api.previewer.query = function() {
 				var retval = originalQuery.apply( this, arguments );
 
-				if ( ! _.isUndefined( CustomizerBrowserHistory ) ) {
+				if ( 'undefined' !== typeof CustomizerBrowserHistory ) {
 					retval.customize_preview_url_query_vars = JSON.stringify( CustomizerBrowserHistory.getQueryParams( location.href ) );
 				}
 

diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
@@ -525,15 +525,17 @@ public function replace_customize_link( $wp_admin_bar ) {
 			);
 		}
 
-		$post_id = $this->post_type->find_post( $this->current_snapshot_uuid );
-		$preview_url_query_vars = $this->post_type->get_preview_url_query_vars( $post_id );
-
 		$args = array(
 			$this->get_customize_uuid_param() => $this->current_snapshot_uuid,
 		);
 
-		if ( ! empty( $preview_url_query_vars ) ) {
-			$args = array_merge( $args, $preview_url_query_vars );
+		$post = $this->snapshot->post();
+
+		if ( $post ) {
+			$preview_url_query_vars = $this->post_type->get_preview_url_query_vars( $post->ID );
+			if ( ! empty( $preview_url_query_vars ) ) {
+				$args = array_merge( $args, $preview_url_query_vars );
+			}
 		}
 
 		// Add customize_snapshot_uuid and preview url params to customize.php itself.