<!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>[34170] trunk/src: Create a function, `get_preview_post_link()`, to DRY the logic for applying the `'preview_post_link'` filter to a URL.</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/34170">34170</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/34170","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-15 04:14:23 +0000 (Tue, 15 Sep 2015)</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'>Create a function, `get_preview_post_link()`, to DRY the logic for applying the `'preview_post_link'` filter to a URL.
Props TomHarrigan, wonderboymusic.
Fixes <a href="https://core.trac.wordpress.org/ticket/24345">#24345</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.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>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></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/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-admin/edit-form-advanced.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +81,7 @@
</span><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"> $messages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** This filter is documented in wp-admin/includes/meta-boxes.php */
-$post_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$post_preview_url = get_preview_post_link( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_link_html = $scheduled_link_html = $view_post_html = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,8 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 10 => __( 'Post draft updated.' ) . $preview_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** This filter is documented in wp-admin/includes/meta-boxes.php */
-$page_preview_url = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $permalink ), $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$page_preview_url = get_preview_post_link( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $messages['page'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => '', // Unused. Messages start at index 1.
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1527,7 +1527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_get_permalink() {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( add_query_arg( array( 'preview' => 'true' ), get_permalink( $post_id ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( get_preview_post_link( $post_id ) );
</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"> /**
</span></span></pre></div>
<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 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1157,9 +1157,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = _draft_or_post_title();
</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">- $preview_link = set_url_scheme( get_permalink( $post->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $unpublished_link = set_url_scheme( get_permalink( $post ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/meta-boxes.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_link = get_preview_post_link( $post, array(), $unpublished_link );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['view'] = '<a href="' . esc_url( $preview_link ) . '" title="' . esc_attr( sprintf( __( 'Preview “%s”' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'trash' != $post->post_status ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,22 +40,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="preview-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$preview_link = esc_url( get_preview_post_link( $post ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' == $post->post_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_link = esc_url( get_permalink( $post->ID ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $preview_button = __( 'Preview Changes' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $preview_button = __( 'Preview' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-admin/includes/post.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1318,9 +1318,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $view_post ) ) {
</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">- $preview_link = set_url_scheme( get_permalink( $post->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $draft_link = set_url_scheme( get_permalink( $post->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/meta-boxes.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_link = get_preview_post_link( $post, array(), $draft_link );
</ins><span class="cx" style="display: block; padding: 0 10px"> $return .= "<span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "' class='button button-small' target='wp-preview-{$post->ID}'>$view_post</a></span>\n";
</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 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1511,20 +1511,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $locked ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_type_object( $post->post_type )->public ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_link = set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Latest content is in autosave
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'post_preview_' . $post->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_link = add_query_arg( array( 'preview_id' => $post->ID, 'preview_nonce' => $nonce ), $preview_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args['preview_id'] = $post->ID;
+ $query_args['preview_nonce'] = $nonce;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $preview_link = '';
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in wp-admin/includes/meta-boxes.php */
- $preview_link = apply_filters( 'preview_post_link', $preview_link, $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_link = get_preview_post_link( $post->ID, $query_args );
</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"> * Filter whether to allow the post lock to be overridden.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1710,7 +1707,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $saved_post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $saved_post_id->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_args = array( 'preview' => 'true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_autosave && $saved_post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args['preview_id'] = $post->ID;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1720,10 +1717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_preview_post_link( $post, $query_args );
</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"> /**
</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 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-includes/admin-bar.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,9 +550,8 @@
</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">- $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 );
</del><ins style="background-color: #dfd; 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 );
</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 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-includes/link-template.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1159,6 +1159,46 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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 );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieve edit posts link for post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Can be used within the WordPress loop or outside of it. Can be used with
</span></span></pre></div>
<a id="trunksrcwpincludesposttemplatephp"></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/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2015-09-15 04:07:14 UTC (rev 34169)
+++ trunk/src/wp-includes/post-template.php 2015-09-15 04:14:23 UTC (rev 34170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,6 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_link_page( $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,16 +913,13 @@
</span><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"> if ( is_preview() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( array(
- 'preview' => 'true'
- ), $url );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( array(
- 'preview_id' => wp_unslash( $_GET['preview_id'] ),
- 'preview_nonce' => wp_unslash( $_GET['preview_nonce'] )
- ), $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
+ $query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $url = get_preview_post_link( $post, $query_args, $url );
</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"> return '<a href="' . esc_url( $url ) . '">';
</span></span></pre>
</div>
</div>
</body>
</html>