<!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>[23653] trunk/wp-includes/post-template.php: Make wp_link_pages() filterable.</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/23653">23653</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-03-08 18:33:52 +0000 (Fri, 08 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make wp_link_pages() filterable. Add 'separator' argument. Simplify the function logic. props obenland, brianlayman. fixes <a href="http://core.trac.wordpress.org/ticket/13578">#13578</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (23652 => 23653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2013-03-08 17:01:33 UTC (rev 23652)
+++ trunk/wp-includes/post-template.php 2013-03-08 18:33:52 UTC (rev 23653)
</span><span class="lines">@@ -602,15 +602,6 @@
</span><span class="cx"> * Quicktag one or more times). This tag must be within The Loop.
</span><span class="cx"> *
</span><span class="cx"> * The defaults for overwriting are:
</span><del>- * 'next_or_number' - Default is 'number' (string). Indicates whether page
- * numbers should be used. Valid values are number and next.
- * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page.
- * of the bookmark.
- * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to
- * previous page, if available.
- * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in
- * the parameter string will be replaced with the page number, so Page %
- * generates "Page 1", "Page 2", etc. Defaults to %, just the page number.
</del><span class="cx"> * 'before' - Default is '<p> Pages:' (string). The html or text to prepend to
</span><span class="cx"> * each bookmarks.
</span><span class="cx"> * 'after' - Default is '</p>' (string). The html or text to append to each
</span><span class="lines">@@ -621,20 +612,36 @@
</span><span class="cx"> * 'link_after' - Default is '' (string). The html or text to append to each
</span><span class="cx"> * Pages link inside the <a> tag. Also appended to the current item, which
</span><span class="cx"> * is not linked.
</span><ins>+ * 'next_or_number' - Default is 'number' (string). Indicates whether page
+ * numbers should be used. Valid values are number and next.
+ * 'separator' - Default is ' ' (string). Text used between pagination links.
+ * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page.
+ * of the bookmark.
+ * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to
+ * previous page, if available.
+ * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in
+ * the parameter string will be replaced with the page number, so Page %
+ * generates "Page 1", "Page 2", etc. Defaults to %, just the page number.
+ * 'echo' - Default is 1 (integer). When not 0, this triggers the HTML to be
+ * echoed and then returned.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.2.0
</span><del>- * @access private
</del><span class="cx"> *
</span><span class="cx"> * @param string|array $args Optional. Overwrite the defaults.
</span><span class="cx"> * @return string Formatted output in HTML.
</span><span class="cx"> */
</span><del>-function wp_link_pages($args = '') {
</del><ins>+function wp_link_pages( $args = '' ) {
</ins><span class="cx"> $defaults = array(
</span><del>- 'before' => '<p>' . __('Pages:'), 'after' => '</p>',
- 'link_before' => '', 'link_after' => '',
- 'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
- 'previouspagelink' => __('Previous page'), 'pagelink' => '%',
- 'echo' => 1
</del><ins>+ 'before' => '<p>' . __( 'Pages:' ),
+ 'after' => '</p>',
+ 'link_before' => '',
+ 'link_after' => '',
+ 'next_or_number' => 'number',
+ 'separator' => ' ',
+ 'nextpagelink' => __( 'Next page' ),
+ 'previouspagelink' => __( 'Previous page' ),
+ 'pagelink' => '%',
+ 'echo' => 1
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -647,35 +654,34 @@
</span><span class="cx"> if ( $multipage ) {
</span><span class="cx"> if ( 'number' == $next_or_number ) {
</span><span class="cx"> $output .= $before;
</span><del>- for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) {
- $j = str_replace('%',$i,$pagelink);
- $output .= ' ';
- if ( ($i != $page) || ((!$more) && ($page==1)) ) {
- $output .= _wp_link_page($i);
- }
- $output .= $link_before . $j . $link_after;
- if ( ($i != $page) || ((!$more) && ($page==1)) )
- $output .= '</a>';
</del><ins>+ for ( $i = 1; $i <= $numpages; $i++ ) {
+ $link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after;
+ if ( $i != $page || ! $more && 1 == $page )
+ $link = _wp_link_page( $i ) . $link . '</a>';
+ $link = apply_filters( 'wp_link_pages_link', $link, $i );
+ $output .= $separator . $link;
</ins><span class="cx"> }
</span><span class="cx"> $output .= $after;
</span><del>- } else {
- if ( $more ) {
- $output .= $before;
- $i = $page - 1;
- if ( $i && $more ) {
- $output .= _wp_link_page($i);
- $output .= $link_before. $previouspagelink . $link_after . '</a>';
- }
- $i = $page + 1;
- if ( $i <= $numpages && $more ) {
- $output .= _wp_link_page($i);
- $output .= $link_before. $nextpagelink . $link_after . '</a>';
- }
- $output .= $after;
</del><ins>+ } elseif ( $more ) {
+ $output .= $before;
+ $i = $page - 1;
+ if ( $i ) {
+ $link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '</a>';
+ $link = apply_filters( 'wp_link_pages_link', $link, $i );
+ $output .= $separator . $link;
</ins><span class="cx"> }
</span><ins>+ $i = $page + 1;
+ if ( $i <= $numpages ) {
+ $link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . '</a>';
+ $link = apply_filters( 'wp_link_pages_link', $link, $i );
+ $output .= $separator . $link;
+ }
+ $output .= $after;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $output = apply_filters( 'wp_link_pages', $output, $args );
+
</ins><span class="cx"> if ( $echo )
</span><span class="cx"> echo $output;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>