Changeset 34170

Timestamp:

09/15/2015 04:14:23 AM (9 years ago)

Author:

wonderboymusic

Message:

Create a function, get_preview_post_link(), to DRY the logic for applying the 'preview_post_link' filter to a URL.

Props TomHarrigan, wonderboymusic.
Fixes #24345.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (4 diffs)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (2 diffs)

trunk/src/wp-admin/edit-form-advanced.php

@@ -82 +82 @@
 
 $messages = array();
-/** This filter is documented in wp-admin/includes/meta-boxes.php */
-$post_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
+$post_preview_url = get_preview_post_link( $post );
 
 $preview_link_html = $scheduled_link_html = $view_post_html = '';
@@ -126 +125 @@
 );
 
-/** This filter is documented in wp-admin/includes/meta-boxes.php */
-$page_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
+$page_preview_url = get_preview_post_link( $post );
 
 $messages['page'] = array(

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1528 +1528 @@
     check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
     $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-    wp_die( add_query_arg( array( 'preview' => 'true' ), get_permalink( $post_id ) ) );
+    wp_die( get_preview_post_link( $post_id ) );
 }
 

trunk/src/wp-admin/includes/class-wp-posts-list-table.php

@@ -1158 +1158 @@
             if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
                 if ( $can_edit_post ) {
-                    $preview_link = set_url_scheme( get_permalink( $post->ID ) );
+                    $unpublished_link = set_url_scheme( get_permalink( $post ) );
                     /** This filter is documented in wp-admin/includes/meta-boxes.php */
-                    $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
+                    $preview_link = get_preview_post_link( $post, array(), $unpublished_link );
                     $actions['view'] = '<a href="' . esc_url( $preview_link ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
                 }

trunk/src/wp-admin/includes/meta-boxes.php

@@ -41 +41 @@
 <div id="preview-action">
 <?php
+$preview_link = esc_url( get_preview_post_link( $post ) );
 if ( 'publish' == $post->post_status ) {
-    $preview_link = esc_url( get_permalink( $post->ID ) );
     $preview_button = __( 'Preview Changes' );
 } else {
-    $preview_link = set_url_scheme( get_permalink( $post->ID ) );
-
-    /**
-     * Filter the URI of a post preview in the post submit box.
-     *
-     * @since 2.0.5
-     * @since 4.0.0 $post parameter was added.
-     *
-     * @param string  $preview_link URI the user will be directed to for a post preview.
-     * @param WP_Post $post         Post object.
-     */
-    $preview_link = esc_url( apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ) );
     $preview_button = __( 'Preview' );
 }

trunk/src/wp-admin/includes/post.php

@@ -1319 +1319 @@
     if ( isset( $view_post ) ) {
         if ( 'draft' == $post->post_status ) {
-            $preview_link = set_url_scheme( get_permalink( $post->ID ) );
+            $draft_link = set_url_scheme( get_permalink( $post->ID ) );
             /** This filter is documented in wp-admin/includes/meta-boxes.php */
-            $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
+            $preview_link = get_preview_post_link( $post, array(), $draft_link );
             $return .= "<span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "' class='button button-small' target='wp-preview-{$post->ID}'>$view_post</a></span>\n";
         } else {
@@ -1512 +1512 @@
 
     if ( $locked ) {
+        $query_args = array();
         if ( get_post_type_object( $post->post_type )->public ) {
-            $preview_link = set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) );
-
             if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
                 // Latest content is in autosave
                 $nonce = wp_create_nonce( 'post_preview_' . $post->ID );
-                $preview_link = add_query_arg( array( 'preview_id' => $post->ID, 'preview_nonce' => $nonce ), $preview_link );
+                $query_args['preview_id'] = $post->ID;
+                $query_args['preview_nonce'] = $nonce;
             }
-        } else {
-            $preview_link = '';
-        }
-
-        /** This filter is documented in wp-admin/includes/meta-boxes.php */
-        $preview_link = apply_filters( 'preview_post_link', $preview_link, $post );
+        }
+
+        $preview_link = get_preview_post_link( $post->ID, $query_args );
 
         /**
@@ -1711 +1708 @@
         wp_die( $saved_post_id->get_error_message() );
 
-    $query_args = array( 'preview' => 'true' );
+    $query_args = array();
 
     if ( $is_autosave && $saved_post_id ) {
@@ -1721 +1718 @@
     }
 
-    $url = add_query_arg( $query_args, get_permalink( $post->ID ) );
-
-    /** This filter is documented in wp-admin/includes/meta-boxes.php */
-    return apply_filters( 'preview_post_link', $url, $post );
+    return get_preview_post_link( $post, $query_args );
 }
 

trunk/src/wp-includes/admin-bar.php

@@ -551 +551 @@
         {
             if ( 'draft' == $post->post_status ) {
-                $preview_link = set_url_scheme( get_permalink( $post->ID ) );
-                /** This filter is documented in wp-admin/includes/meta-boxes.php */
-                $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
+                $draft_link = set_url_scheme( get_permalink( $post->ID ) );
+                $preview_link = get_preview_post_link( $post, array(), $draft_link );
                 $wp_admin_bar->add_menu( array(
                     'id' => 'preview',

trunk/src/wp-includes/link-template.php

@@ -1160 +1160 @@
 
 /**
+ * Retrieve preview post link.
+ *
+ * Get the preview post URL. Allow any number of query args to be appended.
+ *
+ * @since 4.4.0
+ *
+ * @param int    $post         Optional. Post ID or WP_Post object. Defaults to global post.
+ * @param array  $query_args   Optional. If preview query arg should be added. Or array of query args to be added.
+ * @param string $preview_link Optional. If a link other than the permalink should be used. Used by _wp_link_page.
+ * @return string
+ */
+function get_preview_post_link( $post = null, $query_args = array(), $preview_link = '' ) {
+    $post = get_post( $post );
+    if ( ! $post ) {
+        return;
+    }
+
+    $post_type_object = get_post_type_object( $post->post_type );
+    if ( is_post_type_viewable( $post_type_object ) ) {
+        if ( ! $preview_link ) {
+            $preview_link = get_permalink( $post );
+        }
+
+        $query_args['preview'] = true;
+        $preview_link = add_query_arg( $query_args, $preview_link );
+    }
+
+    /**
+     * Filter the URI of a post preview in the post submit box.
+     *
+     * @since 2.0.5
+     * @since 4.4.0 $post parameter was added.
+     *
+     * @param string  $preview_link URI the user will be directed to for a post preview.
+     * @param WP_Post $post         Post object.
+     */
+    return apply_filters( 'preview_post_link', $preview_link, $post );
+}
+
+/**
  * Retrieve edit posts link for post.
  *

trunk/src/wp-includes/post-template.php

@@ -900 +900 @@
     global $wp_rewrite;
     $post = get_post();
+    $query_args = array();
 
     if ( 1 == $i ) {
@@ -913 +914 @@
 
     if ( is_preview() ) {
-        $url = add_query_arg( array(
-            'preview' => 'true'
-        ), $url );
 
         if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
-            $url = add_query_arg( array(
-                'preview_id'    => wp_unslash( $_GET['preview_id'] ),
-                'preview_nonce' => wp_unslash( $_GET['preview_nonce'] )
-            ), $url );
-        }
+            $query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
+            $query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
+        }
+
+        $url = get_preview_post_link( $post, $query_args, $url );
     }