Changeset 36926

Timestamp:

03/10/2016 04:41:34 AM (9 years ago)

Author:

jeremyfelt

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

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

@@ -1226 +1226 @@
             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>',

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

@@ -1295 +1295 @@
     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 {

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

@@ -559 +559 @@
         {
             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',

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

@@ -1223 +1223 @@
     if ( is_post_type_viewable( $post_type_object ) ) {
         if ( ! $preview_link ) {
-            $preview_link = get_permalink( $post );
+            $preview_link = set_url_scheme( get_permalink( $post ) );
         }