<!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>[28389] trunk/src/wp-admin/includes/class-wp-list-table.php: Eliminate use of `extract()` in `WP_List_Table::pagination()`:</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28389">28389</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-13 05:26:34 +0000 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `WP_List_Table::pagination()`:
* Set variables instead of extracting `$this->_pagination_args`
* Weird: `$infinite_scroll` is only presently set in subclasses of `WP_List_Table` and never initialized otherwise.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-list-table.php (28388 => 28389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2014-05-13 05:16:39 UTC (rev 28388)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2014-05-13 05:26:34 UTC (rev 28389)
</span><span class="lines">@@ -517,10 +517,16 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> */
</span><span class="cx"> function pagination( $which ) {
</span><del>- if ( empty( $this->_pagination_args ) )
</del><ins>+ if ( empty( $this->_pagination_args ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- extract( $this->_pagination_args, EXTR_SKIP );
</del><ins>+ $total_items = $this->_pagination_args['total_items'];
+ $total_pages = $this->_pagination_args['total_pages'];
+ $infinite_scroll = false;
+ if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+ $infinite_scroll = $this->_pagination_args['infinite_scroll'];
+ }
</ins><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><span class="lines">@@ -533,11 +539,12 @@
</span><span class="cx"> $page_links = array();
</span><span class="cx">
</span><span class="cx"> $disable_first = $disable_last = '';
</span><del>- if ( $current == 1 )
</del><ins>+ if ( $current == 1 ) {
</ins><span class="cx"> $disable_first = ' disabled';
</span><del>- if ( $current == $total_pages )
</del><ins>+ }
+ if ( $current == $total_pages ) {
</ins><span class="cx"> $disable_last = ' disabled';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
</span><span class="cx"> 'first-page' . $disable_first,
</span><span class="cx"> esc_attr__( 'Go to the first page' ),
</span><span class="lines">@@ -552,15 +559,15 @@
</span><span class="cx"> '‹'
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( 'bottom' == $which )
</del><ins>+ if ( 'bottom' == $which ) {
</ins><span class="cx"> $html_current_page = $current;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
</span><span class="cx"> esc_attr__( 'Current page' ),
</span><span class="cx"> $current,
</span><span class="cx"> strlen( $total_pages )
</span><span class="cx"> );
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
</span><span class="cx"> $page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
</span><span class="cx">
</span><span class="lines">@@ -579,15 +586,16 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $pagination_links_class = 'pagination-links';
</span><del>- if ( ! empty( $infinite_scroll ) )
</del><ins>+ if ( ! empty( $infinite_scroll ) ) {
</ins><span class="cx"> $pagination_links_class = ' hide-if-js';
</span><ins>+ }
</ins><span class="cx"> $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
</span><span class="cx">
</span><del>- if ( $total_pages )
</del><ins>+ if ( $total_pages ) {
</ins><span class="cx"> $page_class = $total_pages < 2 ? ' one-page' : '';
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $page_class = ' no-pages';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";
</span><span class="cx">
</span><span class="cx"> echo $this->_pagination;
</span></span></pre>
</div>
</div>
</body>
</html>