<!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>[28401] trunk/src/wp-includes/post-template.php: Eliminate use of `extract()` in `wp_list_pages()` which, surprisingly, didn't even use any of the extracted variables.</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/28401">28401</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 01:21:20 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_list_pages()` which, surprisingly, didn't even use any of the extracted variables.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post-template.php (28400 => 28401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post-template.php 2014-05-15 01:17:37 UTC (rev 28400)
+++ trunk/src/wp-includes/post-template.php 2014-05-15 01:21:20 UTC (rev 28401)
</span><span class="lines">@@ -1001,24 +1001,23 @@
</span><span class="cx"> function wp_list_pages( $args = '' ) {
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'depth' => 0, 'show_date' => '',
</span><del>- 'date_format' => get_option('date_format'),
</del><ins>+ 'date_format' => get_option( 'date_format' ),
</ins><span class="cx"> 'child_of' => 0, 'exclude' => '',
</span><del>- 'title_li' => __('Pages'), 'echo' => 1,
</del><ins>+ 'title_li' => __( 'Pages' ), 'echo' => 1,
</ins><span class="cx"> 'authors' => '', 'sort_column' => 'menu_order, post_title',
</span><span class="cx"> 'link_before' => '', 'link_after' => '', 'walker' => '',
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r, EXTR_SKIP );
</del><span class="cx">
</span><span class="cx"> $output = '';
</span><span class="cx"> $current_page = 0;
</span><span class="cx">
</span><span class="cx"> // sanitize, mostly to keep spaces out
</span><del>- $r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']);
</del><ins>+ $r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
</ins><span class="cx">
</span><span class="cx"> // Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
</span><del>- $exclude_array = ( $r['exclude'] ) ? explode(',', $r['exclude']) : array();
</del><ins>+ $exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the array of pages to exclude from the pages list.
</span><span class="lines">@@ -1031,12 +1030,12 @@
</span><span class="cx">
</span><span class="cx"> // Query pages.
</span><span class="cx"> $r['hierarchical'] = 0;
</span><del>- $pages = get_pages($r);
</del><ins>+ $pages = get_pages( $r );
</ins><span class="cx">
</span><del>- if ( !empty($pages) ) {
- if ( $r['title_li'] )
</del><ins>+ if ( ! empty( $pages ) ) {
+ if ( $r['title_li'] ) {
</ins><span class="cx"> $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> global $wp_query;
</span><span class="cx"> if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
</span><span class="cx"> $current_page = get_queried_object_id();
</span><span class="lines">@@ -1047,10 +1046,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
</del><ins>+ $output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
</ins><span class="cx">
</span><del>- if ( $r['title_li'] )
</del><ins>+ if ( $r['title_li'] ) {
</ins><span class="cx"> $output .= '</ul></li>';
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1060,15 +1060,16 @@
</span><span class="cx"> *
</span><span class="cx"> * @see wp_list_pages()
</span><span class="cx"> *
</span><del>- * @param string $output HTML output of the pages list.
</del><ins>+ * @param string $html HTML output of the pages list.
</ins><span class="cx"> * @param array $r An array of page-listing arguments.
</span><span class="cx"> */
</span><del>- $output = apply_filters( 'wp_list_pages', $output, $r );
</del><ins>+ $html = apply_filters( 'wp_list_pages', $output, $r );
</ins><span class="cx">
</span><del>- if ( $r['echo'] )
- echo $output;
- else
- return $output;
</del><ins>+ if ( $r['echo'] ) {
+ echo $html;
+ } else {
+ return $html;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>