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' );
}
?>
Index: src/wp-admin/includes/post.php
===================================================================
--- src/wp-admin/includes/post.php (revision 34105)
+++ src/wp-admin/includes/post.php (working copy)
@@ -1318,9 +1318,9 @@
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 .= "
$view_post\n";
} else {
if ( 'publish' === $post->post_status ) {
@@ -1511,20 +1511,17 @@
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 );
/**
* Filter whether to allow the post lock to be overridden.
@@ -1710,7 +1707,7 @@
if ( is_wp_error( $saved_post_id ) )
wp_die( $saved_post_id->get_error_message() );
- $query_args = array( 'preview' => 'true' );
+ $query_args = array();
if ( $is_autosave && $saved_post_id ) {
$query_args['preview_id'] = $post->ID;
@@ -1720,10 +1717,7 @@
$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
}
- $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 );
}
/**
Index: src/wp-includes/admin-bar.php
===================================================================
--- src/wp-includes/admin-bar.php (revision 34105)
+++ src/wp-includes/admin-bar.php (working copy)
@@ -532,9 +532,8 @@
&& ( $post_type_object->show_in_admin_bar ) )
{
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',
'title' => $post_type_object->labels->view_item,
Index: src/wp-includes/link-template.php
===================================================================
--- src/wp-includes/link-template.php (revision 34105)
+++ src/wp-includes/link-template.php (working copy)
@@ -1159,6 +1159,46 @@
}
/**
+ * 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.
*
* Can be used within the WordPress loop or outside of it. Can be used with
Index: src/wp-includes/post-template.php
===================================================================
--- src/wp-includes/post-template.php (revision 34105)
+++ src/wp-includes/post-template.php (working copy)
@@ -899,6 +899,7 @@
function _wp_link_page( $i ) {
global $wp_rewrite;
$post = get_post();
+ $query_args = array();
if ( 1 == $i ) {
$url = get_permalink();
@@ -912,16 +913,13 @@
}
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 );
}
return '
';