Changeset 34170 for trunk/src/wp-admin/includes/post.php

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.

File:

• trunk/src/wp-admin/includes/post.php (modified) (4 diffs)

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 );
 }