<!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>[27188] trunk/src: Use `selected()` where appropriate in `touch_time()`, `page_template_dropdown()`, and `parent_dropdown()`.</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/27188">27188</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-02-17 22:26:14 +0000 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use `selected()` where appropriate in `touch_time()`, `page_template_dropdown()`, and `parent_dropdown()`. Also, add proper docs.
Props meloniq, DrewAPicture.
Fixes <a href="http://core.trac.wordpress.org/ticket/25889">#25889</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/template.php (27187 => 27188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/template.php 2014-02-17 22:10:57 UTC (rev 27187)
+++ trunk/src/wp-admin/includes/template.php 2014-02-17 22:26:14 UTC (rev 27188)
</span><span class="lines">@@ -615,14 +615,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Print out HTML form date elements for editing post or comment publish date.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><del>- * @param unknown_type $edit
- * @param unknown_type $for_post
- * @param unknown_type $tab_index
- * @param unknown_type $multi
</del><ins>+ * @param int|bool $edit Accepts 1|true for editing the date, 0|false for adding the date.
+ * @param int|bool $for_post Accepts 1|true for applying the date to a post, 0|false for a comment.
+ * @param int|bool $tab_index The tabindex attribute to add. Default 0.
+ * @param int|bool $multi Optional. Whether the additional fields and buttons should be added.
+ * Default 0|false.
</ins><span class="cx"> */
</span><span class="cx"> function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
</span><span class="cx"> global $wp_locale, $comment;
</span><span class="lines">@@ -655,11 +656,9 @@
</span><span class="cx"> $month = "<select " . ( $multi ? '' : 'id="mm" ' ) . "name=\"mm\"$tab_index_attribute>\n";
</span><span class="cx"> for ( $i = 1; $i < 13; $i = $i +1 ) {
</span><span class="cx"> $monthnum = zeroise($i, 2);
</span><del>- $month .= "\t\t\t" . '<option value="' . $monthnum . '"';
- if ( $i == $mm )
- $month .= ' selected="selected"';
</del><ins>+ $month .= "\t\t\t" . '<option value="' . $monthnum . '" ' . selected( $i, $mm, false ) . '>';
</ins><span class="cx"> /* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
</span><del>- $month .= '>' . sprintf( __( '%1$s-%2$s' ), $monthnum, $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) ) . "</option>\n";
</del><ins>+ $month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) ) . "</option>\n";
</ins><span class="cx"> }
</span><span class="cx"> $month .= '</select>';
</span><span class="cx">
</span><span class="lines">@@ -680,7 +679,7 @@
</span><span class="cx"> foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit ) {
</span><span class="cx"> echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $$timeunit . '" />' . "\n";
</span><span class="cx"> $cur_timeunit = 'cur_' . $timeunit;
</span><del>- echo '<input type="hidden" id="'. $cur_timeunit . '" name="'. $cur_timeunit . '" value="' . $$cur_timeunit . '" />' . "\n";
</del><ins>+ echo '<input type="hidden" id="' . $cur_timeunit . '" name="' . $cur_timeunit . '" value="' . $$cur_timeunit . '" />' . "\n";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -692,33 +691,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Print out <option> HTML elements for the page templates drop-down.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param unknown_type $default
</del><ins>+ * @param string $default Optional. The template file name. Default empty.
</ins><span class="cx"> */
</span><span class="cx"> function page_template_dropdown( $default = '' ) {
</span><span class="cx"> $templates = get_page_templates();
</span><span class="cx"> ksort( $templates );
</span><del>- foreach (array_keys( $templates ) as $template )
- : if ( $default == $templates[$template] )
- $selected = " selected='selected'";
- else
- $selected = '';
- echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
- endforeach;
</del><ins>+ foreach ( array_keys( $templates ) as $template ) {
+ $selected = selected( $default, $templates[ $template ], false );
+ echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Print out <option> HTML elements for the page parents drop-down.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param unknown_type $default
- * @param unknown_type $parent
- * @param unknown_type $level
- * @return unknown
</del><ins>+ * @param int $default Optional. The default page ID to be pre-selected. Default 0.
+ * @param int $parent Optional. The parent page ID. Default 0.
+ * @param int $level Optional. Page depth level. Default 0.
+ *
+ * @return void|bool Boolean False if page has no children, otherwise print out html elements
</ins><span class="cx"> */
</span><span class="cx"> function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -732,12 +729,9 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $pad = str_repeat( ' ', $level * 3 );
</span><del>- if ( $item->ID == $default)
- $current = ' selected="selected"';
- else
- $current = '';
</del><ins>+ $selected = selected( $default, $item->ID, false );
</ins><span class="cx">
</span><del>- echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
</del><ins>+ echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html($item->post_title) . "</option>";
</ins><span class="cx"> parent_dropdown( $default, $item->ID, $level +1 );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/link-template.php (27187 => 27188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/link-template.php 2014-02-17 22:10:57 UTC (rev 27187)
+++ trunk/src/wp-includes/link-template.php 2014-02-17 22:26:14 UTC (rev 27188)
</span><span class="lines">@@ -69,6 +69,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Alias for get_permalink()
+ *
+ * @since 3.9.0
+ *
+ * @param int|WP_Post $id Optional. Post ID or post object, defaults to the current post.
+ * @param bool $leavename Optional. Whether to keep post name or page name, defaults to false.
+ * @return string|bool The permalink URL or false if post does not exist.
+ */
+function get_the_permalink( $id = 0, $leavename = false ) {
+ return get_permalink( $id, $leavename );
+}
+
+/**
</ins><span class="cx"> * Retrieve full permalink for current post or post ID.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span></span></pre>
</div>
</div>
</body>
</html>