From 91513893c27ac489246ac87fb8c9f508aa0a6197 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Thu, 10 Mar 2016 04:41:34 +0000 Subject: [PATCH] Posts: Call `set_url_scheme()` consistently on URLs passed through `preview_post_link` After [34170], some preview URLs that passed through `set_url_scheme()` no longer do so. We can restore that behavior by applying `set_url_scheme()` whenever `get_preview_post_link()` provides the URL. Props danielbachhuber. Fixes #35407. git-svn-id: https://develop.svn.wordpress.org/trunk@36926 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-posts-list-table.php | 3 +-- src/wp-admin/includes/post.php | 3 +-- src/wp-includes/admin-bar.php | 3 +-- src/wp-includes/link-template.php | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php index ce68efccbf..33eca44a83 100644 --- a/src/wp-admin/includes/class-wp-posts-list-table.php +++ b/src/wp-admin/includes/class-wp-posts-list-table.php @@ -1225,8 +1225,7 @@ class WP_Posts_List_Table extends WP_List_Table { if ( is_post_type_viewable( $post_type_object ) ) { if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) { if ( $can_edit_post ) { - $unpublished_link = set_url_scheme( get_permalink( $post ) ); - $preview_link = get_preview_post_link( $post, array(), $unpublished_link ); + $preview_link = get_preview_post_link( $post ); $actions['view'] = sprintf( '%s', esc_url( $preview_link ), diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php index 2a41442534..8be61474bc 100644 --- a/src/wp-admin/includes/post.php +++ b/src/wp-admin/includes/post.php @@ -1294,8 +1294,7 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { if ( current_user_can( 'read_post', $post->ID ) ) { if ( 'draft' === $post->post_status ) { - $draft_link = set_url_scheme( get_permalink( $post->ID ) ); - $view_link = get_preview_post_link( $post, array(), $draft_link ); + $view_link = get_preview_post_link( $post ); $preview_target = " target='wp-preview-{$post->ID}'"; } else { if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) { diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php index ab6d055955..c043aef81b 100644 --- a/src/wp-includes/admin-bar.php +++ b/src/wp-includes/admin-bar.php @@ -558,8 +558,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { && ( $post_type_object->show_in_admin_bar ) ) { if ( 'draft' == $post->post_status ) { - $draft_link = set_url_scheme( get_permalink( $post->ID ) ); - $preview_link = get_preview_post_link( $post, array(), $draft_link ); + $preview_link = get_preview_post_link( $post ); $wp_admin_bar->add_menu( array( 'id' => 'preview', 'title' => $post_type_object->labels->view_item, diff --git a/src/wp-includes/link-template.php b/src/wp-includes/link-template.php index a7ad29d18a..cc87f77cc9 100644 --- a/src/wp-includes/link-template.php +++ b/src/wp-includes/link-template.php @@ -1222,7 +1222,7 @@ function get_preview_post_link( $post = null, $query_args = array(), $preview_li $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 ); + $preview_link = set_url_scheme( get_permalink( $post ) ); } $query_args['preview'] = 'true';