Ticket #35407: 35407.diff

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

@@ -1225 +1225 @@
                 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(
                                                 '<a href="%s" rel="permalink" aria-label="%s">%s</a>',
                                                 esc_url( $preview_link ),

src/wp-admin/includes/post.php

@@ -1294 +1294 @@
 
         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 ) {

src/wp-includes/admin-bar.php

@@ -558 +558 @@
                         && ( $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,

src/wp-includes/link-template.php

@@ -1222 +1222 @@
         $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';