<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13494] trunk/wp-includes: Re-use /page/xx/
for Post Paging on Page_on_front.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13494">13494</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 09:40:42 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-use /page/xx/ for Post Paging on Page_on_front. Few fixes related to paging on front page. Fixes <a href="http://trac.wordpress.org/ticket/12391">#12391</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.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 (13493 => 13494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-02-28 09:19:34 UTC (rev 13493)
+++ trunk/wp-includes/post-template.php 2010-02-28 09:40:42 UTC (rev 13494)
</span><span class="lines">@@ -587,7 +587,9 @@
</span><span class="cx"> $output .= '<a href="' . get_permalink() . '">';
</span><span class="cx"> } else {
</span><span class="cx"> if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
</span><del>- $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
</del><ins>+ $output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+ elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+ $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
</ins><span class="cx"> else
</span><span class="cx"> $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
</span><span class="cx"> }
</span><span class="lines">@@ -606,24 +608,30 @@
</span><span class="cx"> $i = $page - 1;
</span><span class="cx"> if ( $i && $more ) {
</span><span class="cx"> if ( 1 == $i ) {
</span><del>- $output .= '<a href="' . get_permalink() . '">' . $link_before. $previouspagelink . $link_after . '</a>';
</del><ins>+ $output .= '<a href="' . get_permalink() . '">';
</ins><span class="cx"> } else {
</span><span class="cx"> if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
</span><del>- $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $link_before. $previouspagelink . $link_after . '</a>';
</del><ins>+ $output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+ elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+ $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
</ins><span class="cx"> else
</span><del>- $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $link_before. $previouspagelink . $link_after . '</a>';
</del><ins>+ $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
</ins><span class="cx"> }
</span><ins>+ $output .= $link_before. $previouspagelink . $link_after . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> $i = $page + 1;
</span><span class="cx"> if ( $i <= $numpages && $more ) {
</span><span class="cx"> if ( 1 == $i ) {
</span><del>- $output .= '<a href="' . get_permalink() . '">' . $link_before. $nextpagelink . $link_after . '</a>';
</del><ins>+ $output .= '<a href="' . get_permalink() . '">';
</ins><span class="cx"> } else {
</span><span class="cx"> if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
</span><del>- $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $link_before. $nextpagelink . $link_after . '</a>';
</del><ins>+ $output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+ elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+ $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
</ins><span class="cx"> else
</span><del>- $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $link_before. $nextpagelink . $link_after . '</a>';
</del><ins>+ $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
</ins><span class="cx"> }
</span><ins>+ $output .= $link_before. $nextpagelink . $link_after . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> $output .= $after;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13493 => 13494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-02-28 09:19:34 UTC (rev 13493)
+++ trunk/wp-includes/query.php 2010-02-28 09:40:42 UTC (rev 13494)
</span><span class="lines">@@ -1480,11 +1480,18 @@
</span><span class="cx"> (
</span><span class="cx"> empty($this->query) ||
</span><span class="cx"> !empty($qv['preview']) ||
</span><del>- !empty($qv['cpage'])
</del><ins>+ !empty($qv['cpage']) ||
+ !empty($qv['page']) ||
+ !empty($qv['paged'])
</ins><span class="cx"> ) ) {
</span><span class="cx"> $this->is_page = true;
</span><span class="cx"> $this->is_home = false;
</span><span class="cx"> $qv['page_id'] = get_option('page_on_front');
</span><ins>+ // Correct <!--nextpage--> for page_on_front
+ if ( !empty($qv['paged']) ) {
+ $qv['page'] = $qv['paged'];
+ unset($qv['paged']);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( '' != $qv['pagename'] ) {
</span></span></pre>
</div>
</div>
</body>
</html>