<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36926] trunk/src: Posts: Call `set_url_scheme()` consistently on URLs passed through `preview_post_link`</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36926">36926</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36926","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-10 04:41:34 +0000 (Thu, 10 Mar 2016)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Posts: Call `set_url_scheme()` consistently on URLs passed through `preview_post_link`

After <a href="https://core.trac.wordpress.org/changeset/34170">[34170]</a>, 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 <a href="https://core.trac.wordpress.org/ticket/35407">#35407</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2016-03-10 03:37:43 UTC (rev 36925)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php   2016-03-10 04:41:34 UTC (rev 36926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1225,8 +1225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_post_type_viewable( $post_type_object ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( $can_edit_post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $unpublished_link = set_url_scheme( get_permalink( $post ) );
-                                       $preview_link = get_preview_post_link( $post, array(), $unpublished_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $preview_link = get_preview_post_link( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $actions['view'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                '<a href="%s" rel="permalink" aria-label="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                esc_url( $preview_link ),
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php      2016-03-10 03:37:43 UTC (rev 36925)
+++ trunk/src/wp-admin/includes/post.php        2016-03-10 04:41:34 UTC (rev 36926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1294,8 +1294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( current_user_can( 'read_post', $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'draft' === $post->post_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $draft_link = set_url_scheme( get_permalink( $post->ID ) );
-                       $view_link = get_preview_post_link( $post, array(), $draft_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $view_link = get_preview_post_link( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $preview_target = " target='wp-preview-{$post->ID}'";
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
</span></span></pre></div>
<a id="trunksrcwpincludesadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php       2016-03-10 03:37:43 UTC (rev 36925)
+++ trunk/src/wp-includes/admin-bar.php 2016-03-10 04:41:34 UTC (rev 36926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,8 +558,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        && ( $post_type_object->show_in_admin_bar ) )
</span><span class="cx" style="display: block; padding: 0 10px">                {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'draft' == $post->post_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $draft_link = set_url_scheme( get_permalink( $post->ID ) );
-                               $preview_link = get_preview_post_link( $post, array(), $draft_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $preview_link = get_preview_post_link( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $wp_admin_bar->add_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'id' => 'preview',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'title' => $post_type_object->labels->view_item,
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php   2016-03-10 03:37:43 UTC (rev 36925)
+++ trunk/src/wp-includes/link-template.php     2016-03-10 04:41:34 UTC (rev 36926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1222,7 +1222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $post_type_object = get_post_type_object( $post->post_type );
</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_post_type_viewable( $post_type_object ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $preview_link ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $preview_link = get_permalink( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $preview_link = set_url_scheme( get_permalink( $post ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $query_args['preview'] = 'true';
</span></span></pre>
</div>
</div>

</body>
</html>