Remove previewing of post slug; force all post URLs to be preview

westonruter · westonruter · commit 97ddef188da3 · 2016-05-26T00:08:32.000-07:00
Fixes #42
diff --git a/php/class-wp-customize-posts-preview.php b/php/class-wp-customize-posts-preview.php
@@ -521,9 +521,6 @@ public function get_post_field_partial_schema( $field_id = '' ) {
 			'post_title' => array(
 				'selector' => '.entry-title',
 			),
-			'post_name' => array(
-				'fallback_refresh' => true,
-			),
 			'post_content' => array(
 				'selector' => '.entry-content',
 			),
diff --git a/php/class-wp-customize-posts.php b/php/class-wp-customize-posts.php
@@ -89,7 +89,7 @@ public function __construct( WP_Customize_Manager $manager ) {
 		add_filter( 'customize_snapshot_save', array( $this, 'transition_customize_draft' ) );
 		add_filter( 'post_link', array( $this, 'post_link_draft' ), 10, 2 );
 		add_filter( 'post_type_link', array( $this, 'post_link_draft' ), 10, 2 );
-		add_filter( 'page_link', array( $this, 'page_link_draft' ), 10, 2 );
+		add_filter( 'page_link', array( $this, 'post_link_draft' ), 10, 2 );
 		add_action( 'wp_ajax_customize-posts-add-new', array( $this, 'ajax_add_new_post' ) );
 
 		$this->preview = new WP_Customize_Posts_Preview( $this );
@@ -702,57 +702,17 @@ public function transition_customize_draft( $data ) {
 	 *
 	 * @access public
 	 *
-	 * @param string  $permalink The post's permalink.
-	 * @param WP_Post $post      The post in question.
+	 * @param string      $permalink The post's permalink.
+	 * @param int|WP_Post $post      The post in question.
 	 * @return string
 	 */
 	public function post_link_draft( $permalink, $post ) {
-		if ( $post instanceof WP_Post ) {
-			remove_filter( 'post_link', array( $this, 'post_link_draft' ), 10 );
-			remove_filter( 'post_type_link', array( $this, 'post_link_draft' ), 10 );
-			$old_permalink = get_permalink( $post->ID );
-			add_filter( 'post_link', array( $this, 'post_link_draft' ), 10, 2 );
-			add_filter( 'post_type_link', array( $this, 'post_link_draft' ), 10, 2 );
-
-			$post_status_match = in_array( get_post_status( $post->ID ), self::$draft_status, true );
-			$post_slug_mismatch = get_option( 'permalink_structure' ) && basename( $old_permalink ) !== $post->post_name;
-
-			if ( $post_status_match || $post_slug_mismatch ) {
-				$permalink = Edit_Post_Preview::get_preview_post_link( $post );
-			}
+		if ( is_customize_preview() ) {
+			$permalink = Edit_Post_Preview::get_preview_post_link( get_post( $post ) );
 		}
-
 		return $permalink;
 	}
 
-	/**
-	 * Filter the preview permalink for a page.
-	 *
-	 * @access public
-	 *
-	 * @param string $link    The page's permalink.
-	 * @param int    $post_id The ID of the page.
-	 * @return string
-	 */
-	public function page_link_draft( $link, $post_id ) {
-		$post = get_post( $post_id );
-
-		if ( $post instanceof WP_Post ) {
-			remove_filter( 'page_link', array( $this, 'page_link_draft' ), 10 );
-			$old_permalink = get_permalink( $post->ID );
-			add_filter( 'page_link', array( $this, 'page_link_draft' ), 10, 2 );
-
-			$post_status_match = in_array( get_post_status( $post->ID ), self::$draft_status, true );
-			$post_slug_mismatch = get_option( 'permalink_structure' ) && basename( $old_permalink ) !== $post->post_name;
-
-			if ( $post_status_match || $post_slug_mismatch ) {
-				$link = Edit_Post_Preview::get_preview_post_link( $post );
-			}
-		}
-
-		return $link;
-	}
-
 	/**
 	 * Add a new `auto-draft` post.
 	 *
