Merge pull request #89 from xwp/bugfix/snapshot-publish-issue

westonruter · web-flow · commit 010daf7ab180 · 2016-08-31T11:50:42.000-07:00
Fix snapshot publish issue after settings save
diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
@@ -794,7 +794,7 @@ function( $value ) {
 			},
 			$this->customize_manager->unsanitized_post_values()
 		);
-		$result = $this->snapshot->set( $settings_data );
+		$result = $this->snapshot->set( $settings_data, array( 'skip_validation' => true ) );
 		if ( ! empty( $result['errors'] ) ) {
 			add_filter( 'customize_save_response', function( $response ) use ( $result, $that ) {
 				$response['snapshot_errors'] = $that->prepare_errors_for_response( $result['errors'] );
@@ -1299,7 +1299,7 @@ public function replace_customize_link( $wp_admin_bar ) {
 			return;
 		}
 
-		// Remove customize_snapshot_uuuid query param from url param to be previewed in Customizer.
+		// Remove customize_snapshot_uuid query param from url param to be previewed in Customizer.
 		$preview_url_query_params = array();
 		$preview_url_parsed = wp_parse_url( $customize_node->href );
 		parse_str( $preview_url_parsed['query'], $preview_url_query_params );
diff --git a/php/class-customize-snapshot.php b/php/class-customize-snapshot.php
@@ -141,6 +141,11 @@ public function status() {
 	 * @throws Exception When $settings_data is not an array of arrays.
 	 *
 	 * @param array $settings_data Settings data, mapping setting IDs to arrays containing `value` and optionally additional params.
+	 * @param array $options {
+	 *     Additional options.
+	 *
+	 *     @type bool $skip_validation Whether to skip validation. Optional, defaults to false.
+	 * }
 	 * @return array {
 	 *     Result.
 	 *
@@ -149,7 +154,7 @@ public function status() {
 	 *     @type array          $validities Setting validities.
 	 * }
 	 */
-	public function set( array $settings_data ) {
+	public function set( array $settings_data, array $options = array() ) {
 		$error = new \WP_Error();
 		$result = array(
 			'errors' => null,
@@ -188,26 +193,29 @@ public function set( array $settings_data ) {
 			)
 		);
 
-		// Validate.
-		if ( method_exists( $customize_manager, 'validate_setting_values' ) ) {
-			$result['validities'] = $customize_manager->validate_setting_values( $unsanitized_values );
-		} else {
-			// @codeCoverageIgnoreStart
-			$result['validities'] = array_map(
-				function( $sanitized ) {
-					if ( is_null( $sanitized ) ) {
-						return new \WP_Error( 'invalid_value', __( 'Invalid value', 'customize-snapshots' ) );
-					} else {
-						return true;
-					}
-				},
-				$unsanitized_values
-			);
-			// @codeCoverageIgnoreEnd
+		$invalid_setting_ids = array();
+		if ( empty( $options['skip_validation'] ) ) {
+			// Validate.
+			if ( method_exists( $customize_manager, 'validate_setting_values' ) ) {
+				$result['validities'] = $customize_manager->validate_setting_values( $unsanitized_values );
+			} else {
+				// @codeCoverageIgnoreStart
+				$result['validities'] = array_map(
+					function( $sanitized ) {
+						if ( is_null( $sanitized ) ) {
+							return new \WP_Error( 'invalid_value', __( 'Invalid value', 'customize-snapshots' ) );
+						} else {
+							return true;
+						}
+					},
+					$unsanitized_values
+				);
+				// @codeCoverageIgnoreEnd
+			}
+			$invalid_setting_ids = array_keys( array_filter( $result['validities'], function( $validity ) {
+				return is_wp_error( $validity );
+			} ) );
 		}
-		$invalid_setting_ids = array_keys( array_filter( $result['validities'], function( $validity ) {
-			return is_wp_error( $validity );
-		} ) );
 
 		// Sanitize.
 		foreach ( $unsanitized_values as $setting_id => $unsanitized_value ) {
