<!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>[28399] trunk: Eliminate use of `extract()` in `wp_dropdown_pages()`.</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/28399">28399</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 01:11:21 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_dropdown_pages()`.
Adds unit tests to: `tests/post/template.php`.
There was previously only one wimpy assertion for `wp_dropdown_pages()`.
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>
<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>
<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/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 (28398 => 28399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post-template.php 2014-05-15 00:43:40 UTC (rev 28398)
+++ trunk/src/wp-includes/post-template.php 2014-05-15 01:11:21 UTC (rev 28399)
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx"> * @param array|string $args Optional. Override default arguments.
</span><span class="cx"> * @return string HTML content, if not displaying.
</span><span class="cx"> */
</span><del>-function wp_dropdown_pages($args = '') {
</del><ins>+function wp_dropdown_pages( $args = '' ) {
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'depth' => 0, 'child_of' => 0,
</span><span class="cx"> 'selected' => 0, 'echo' => 1,
</span><span class="lines">@@ -928,21 +928,23 @@
</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><del>- $pages = get_pages($r);
</del><ins>+ $pages = get_pages( $r );
</ins><span class="cx"> $output = '';
</span><span class="cx"> // Back-compat with old system where both id and name were based on $name argument
</span><del>- if ( empty($id) )
- $id = $name;
</del><ins>+ if ( empty( $r['id'] ) ) {
+ $r['id'] = $r['name'];
+ }
</ins><span class="cx">
</span><del>- if ( ! empty($pages) ) {
- $output = "<select name='" . esc_attr( $name ) . "' id='" . esc_attr( $id ) . "'>\n";
- if ( $show_option_no_change )
- $output .= "\t<option value=\"-1\">$show_option_no_change</option>";
- if ( $show_option_none )
- $output .= "\t<option value=\"" . esc_attr($option_none_value) . "\">$show_option_none</option>\n";
- $output .= walk_page_dropdown_tree($pages, $depth, $r);
</del><ins>+ if ( ! empty( $pages ) ) {
+ $output = "<select name='" . esc_attr( $r['name'] ) . "' id='" . esc_attr( $r['id'] ) . "'>\n";
+ if ( $r['show_option_no_change'] ) {
+ $output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
+ }
+ if ( $r['show_option_none'] ) {
+ $output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
+ }
+ $output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
</ins><span class="cx"> $output .= "</select>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -951,14 +953,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> *
</span><del>- * @param string $output HTML output for drop down list of pages.
</del><ins>+ * @param string $html HTML output for drop down list of pages.
</ins><span class="cx"> */
</span><del>- $output = apply_filters( 'wp_dropdown_pages', $output );
</del><ins>+ $html = apply_filters( 'wp_dropdown_pages', $output );
</ins><span class="cx">
</span><del>- if ( $echo )
- echo $output;
-
- return $output;
</del><ins>+ if ( $r['echo'] ) {
+ echo $html;
+ }
+ return $html;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPagesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/getPages.php (28398 => 28399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/getPages.php 2014-05-15 00:43:40 UTC (rev 28398)
+++ trunk/tests/phpunit/tests/post/getPages.php 2014-05-15 01:11:21 UTC (rev 28399)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> * @ticket 22389
</span><span class="cx"> */
</span><span class="cx"> function test_wp_dropdown_pages() {
</span><del>- $posts = $this->factory->post->create_many( 5, array( 'post_type' => 'page' ) );
</del><ins>+ $this->factory->post->create_many( 5, array( 'post_type' => 'page' ) );
</ins><span class="cx">
</span><span class="cx"> preg_match_all( '#<option#', wp_dropdown_pages( 'echo=0' ), $matches );
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/template.php (28398 => 28399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/template.php 2014-05-15 00:43:40 UTC (rev 28398)
+++ trunk/tests/phpunit/tests/post/template.php 2014-05-15 01:11:21 UTC (rev 28399)
</span><span class="lines">@@ -72,4 +72,63 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( $pagelink, $output );
</span><span class="cx"> }
</span><ins>+
+ function test_wp_dropdown_pages() {
+ $none = wp_dropdown_pages( array( 'echo' => 0 ) );
+ $this->assertEmpty( $none );
+
+ $bump = ' ';
+ $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+ $child_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id ) );
+ $grandchild_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $child_id ) );
+
+ $lineage =<<<LINEAGE
+<select name='page_id' id='page_id'>
+ <option class="level-0" value="$page_id">Post title 1</option>
+ <option class="level-1" value="$child_id">{$bump}Post title 2</option>
+ <option class="level-2" value="$grandchild_id">{$bump}{$bump}Post title 3</option>
+</select>
+
+LINEAGE;
+
+ $output = wp_dropdown_pages( array( 'echo' => 0 ) );
+ $this->assertEquals( $lineage, $output );
+
+ $depth =<<<DEPTH
+<select name='page_id' id='page_id'>
+ <option class="level-0" value="$page_id">Post title 1</option>
+</select>
+
+DEPTH;
+
+ $output = wp_dropdown_pages( array( 'echo' => 0, 'depth' => 1 ) );
+ $this->assertEquals( $depth, $output );
+
+ $option_none =<<<NONE
+<select name='page_id' id='page_id'>
+ <option value="Woo">Hoo</option>
+ <option class="level-0" value="$page_id">Post title 1</option>
+</select>
+
+NONE;
+
+ $output = wp_dropdown_pages( array( 'echo' => 0, 'depth' => 1,
+ 'show_option_none' => 'Hoo', 'option_none_value' => 'Woo'
+ ) );
+ $this->assertEquals( $option_none, $output );
+
+ $option_no_change =<<<NO
+<select name='page_id' id='page_id'>
+ <option value="-1">Burrito</option>
+ <option value="Woo">Hoo</option>
+ <option class="level-0" value="$page_id">Post title 1</option>
+</select>
+
+NO;
+ $output = wp_dropdown_pages( array( 'echo' => 0, 'depth' => 1,
+ 'show_option_none' => 'Hoo', 'option_none_value' => 'Woo',
+ 'show_option_no_change' => 'Burrito'
+ ) );
+ $this->assertEquals( $option_no_change, $output );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>