<!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>[16465] trunk/wp-admin/includes: Always use 'paged' in list tables.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16465">16465</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-18 17:00:24 +0000 (Thu, 18 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always use 'paged' in list tables. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (16464 => 16465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2010-11-18 14:23:05 UTC (rev 16464)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2010-11-18 17:00:24 UTC (rev 16465)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> */
</span><span class="cx"> function set_pagination_args( $args ) {
</span><span class="cx"> $args = wp_parse_args( $args, array(
</span><del>- 'query_var' => 'paged',
</del><span class="cx"> 'total_items' => 0,
</span><span class="cx"> 'total_pages' => 0,
</span><span class="cx"> 'per_page' => 0,
</span><span class="lines">@@ -409,8 +408,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @return int
</span><span class="cx"> */
</span><del>- function get_pagenum( $query_var = 'paged' ) {
- $pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
</del><ins>+ function get_pagenum() {
+ $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
</ins><span class="cx">
</span><span class="cx"> return max( 1, $pagenum );
</span><span class="cx"> }
</span><span class="lines">@@ -453,7 +452,7 @@
</span><span class="cx">
</span><span class="cx"> $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
</span><span class="cx">
</span><del>- $current = $this->get_pagenum( $query_var );
</del><ins>+ $current = $this->get_pagenum();
</ins><span class="cx">
</span><span class="cx"> $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
</span><span class="cx">
</span><span class="lines">@@ -462,20 +461,20 @@
</span><span class="cx"> $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
</span><span class="cx"> 'first-page',
</span><span class="cx"> esc_attr__( 'Go to the first page' ),
</span><del>- esc_url( remove_query_arg( $query_var, $current_url ) ),
</del><ins>+ esc_url( remove_query_arg( 'paged', $current_url ) ),
</ins><span class="cx"> '&laquo;&laquo;'
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
</span><span class="cx"> 'prev-page',
</span><span class="cx"> esc_attr__( 'Go to the previous page' ),
</span><del>- esc_url( add_query_arg( $query_var, max( 1, $current-1 ), $current_url ) ),
</del><ins>+ esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
</ins><span class="cx"> '&laquo;'
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />",
</span><span class="cx"> esc_attr__( 'Current page' ),
</span><del>- esc_attr( $query_var ),
</del><ins>+ esc_attr( 'paged' ),
</ins><span class="cx"> number_format_i18n( $current ),
</span><span class="cx"> strlen( $total_pages )
</span><span class="cx"> );
</span><span class="lines">@@ -485,14 +484,14 @@
</span><span class="cx"> $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
</span><span class="cx"> 'next-page',
</span><span class="cx"> esc_attr__( 'Go to the next page' ),
</span><del>- esc_url( add_query_arg( $query_var, min( $total_pages, $current+1 ), $current_url ) ),
</del><ins>+ esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
</ins><span class="cx"> '&raquo;'
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
</span><span class="cx"> 'last-page',
</span><span class="cx"> esc_attr__( 'Go to the last page' ),
</span><del>- esc_url( add_query_arg( $query_var, $total_pages, $current_url ) ),
</del><ins>+ esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
</ins><span class="cx"> '&raquo;&raquo;'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (16464 => 16465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php 2010-11-18 14:23:05 UTC (rev 16464)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php 2010-11-18 17:00:24 UTC (rev 16465)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> $this->items = array_slice( $themes, $start, $per_page );
</span><span class="cx">
</span><span class="cx"> $this->set_pagination_args( array(
</span><del>- 'query_var' => 'pagenum',
</del><span class="cx"> 'total_items' => count( $themes ),
</span><span class="cx"> 'per_page' => $per_page,
</span><span class="cx"> ) );
</span></span></pre>
</div>
</div>
</body>
</html>