<!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>[21802] trunk/wp-includes/link-template.php: Preserve the $format and $link arguments for passing to the previous|next_post_link filter.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21802">21802</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-09-10 21:36:06 +0000 (Mon, 10 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Preserve the $format and $link arguments for passing to the previous|next_post_link filter. Pass $post to the filter.
Props Otto42, helenyhou
fixes <a href="http://core.trac.wordpress.org/ticket/19640">#19640</a> <a href="http://core.trac.wordpress.org/ticket/18764">#18764</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (21801 => 21802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2012-09-10 21:16:03 UTC (rev 21801)
+++ trunk/wp-includes/link-template.php 2012-09-10 21:36:06 UTC (rev 21802)
</span><span class="lines">@@ -1364,33 +1364,35 @@
</span><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> * @param bool $previous Optional, default is true. Whether to display link to previous or next post.
</span><span class="cx"> */
</span><del>-function adjacent_post_link($format, $link, $in_same_cat = false, $excluded_categories = '', $previous = true) {
</del><ins>+function adjacent_post_link( $format, $link, $in_same_cat = false, $excluded_categories = '', $previous = true ) {
</ins><span class="cx"> if ( $previous && is_attachment() )
</span><span class="cx"> $post = get_post( get_post()->post_parent );
</span><span class="cx"> else
</span><del>- $post = get_adjacent_post($in_same_cat, $excluded_categories, $previous);
</del><ins>+ $post = get_adjacent_post( $in_same_cat, $excluded_categories, $previous );
</ins><span class="cx">
</span><del>- if ( !$post )
- return;
</del><ins>+ if ( ! $post ) {
+ $output = '';
+ } else {
+ $title = $post->post_title;
</ins><span class="cx">
</span><del>- $title = $post->post_title;
</del><ins>+ if ( empty( $post->post_title ) )
+ $title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
</ins><span class="cx">
</span><del>- if ( empty($post->post_title) )
- $title = $previous ? __('Previous Post') : __('Next Post');
</del><ins>+ $title = apply_filters( 'the_title', $title, $post->ID );
+ $date = mysql2date( get_option( 'date_format' ), $post->post_date );
+ $rel = $previous ? 'prev' : 'next';
</ins><span class="cx">
</span><del>- $title = apply_filters('the_title', $title, $post->ID);
- $date = mysql2date(get_option('date_format'), $post->post_date);
- $rel = $previous ? 'prev' : 'next';
</del><ins>+ $string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
+ $inlink = str_replace( '%title', $title, $link );
+ $inlink = str_replace( '%date', $date, $inlink );
+ $inlink = $string . $inlink . '</a>';
</ins><span class="cx">
</span><del>- $string = '<a href="'.get_permalink($post).'" rel="'.$rel.'">';
- $link = str_replace('%title', $title, $link);
- $link = str_replace('%date', $date, $link);
- $link = $string . $link . '</a>';
</del><ins>+ $output = str_replace( '%link', $inlink, $format );
+ }
</ins><span class="cx">
</span><del>- $format = str_replace('%link', $link, $format);
</del><ins>+ $adjacent = $previous ? 'previous' : 'next';
</ins><span class="cx">
</span><del>- $adjacent = $previous ? 'previous' : 'next';
- echo apply_filters( "{$adjacent}_post_link", $format, $link );
</del><ins>+ echo apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>