<!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>[41734] trunk/src/wp-includes/l10n.php: I18N: Make sure `wp_dropdown_languages()` does not print out empty `name` and `id` attributes.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41734">41734</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41734","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-04 15:22:15 +0000 (Wed, 04 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>I18N: Make sure `wp_dropdown_languages()` does not print out empty `name` and `id` attributes.
Props johnjamesjacoby, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/40829">#40829</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2017-10-04 15:07:26 UTC (rev 41733)
+++ trunk/src/wp-includes/l10n.php 2017-10-04 15:22:15 UTC (rev 41734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,8 +1117,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Array or string of arguments for outputting the language selector.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $id ID attribute of the select element. Default empty.
- * @type string $name Name attribute of the select element. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $id ID attribute of the select element. Default 'locale'.
+ * @type string $name Name attribute of the select element. Default 'locale'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type array $languages List of installed languages, contain only the locales.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $translations List of available translations. Default result of
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1134,8 +1134,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dropdown_languages( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args = wp_parse_args( $args, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => '',
- 'name' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => 'locale',
+ 'name' => 'locale',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'languages' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'translations' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1144,6 +1144,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_option_site_default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if no ID or no name.
+ if ( ! $parsed_args['id'] || ! $parsed_args['name'] ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // English (United States) uses an empty string for the value attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' === $parsed_args['selected'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['selected'] = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,8 +1187,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $translations_available = ( ! empty( $translations ) && $parsed_args['show_available_translations'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = sprintf( '<select name="%s" id="%s">', esc_attr( $parsed_args['name'] ), esc_attr( $parsed_args['id'] ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Holds the HTML markup.
</span><span class="cx" style="display: block; padding: 0 10px"> $structure = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1192,6 +1195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Site default.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['show_option_site_default'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $structure[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<option value="site-default" data-installed="1"%s>%s</option>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1200,11 +1204,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always show English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $structure[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
</span><span class="cx" style="display: block; padding: 0 10px"> selected( '', $parsed_args['selected'], false )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // List installed languages.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $languages as $language ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $structure[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<option value="%s" lang="%s"%s data-installed="1">%s</option>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1233,8 +1239,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $structure[] = '</optgroup>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Combine the output string.
+ $output = sprintf( '<select name="%s" id="%s">', esc_attr( $parsed_args['name'] ), esc_attr( $parsed_args['id'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= join( "\n", $structure );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $output .= '</select>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['echo'] ) {
</span></span></pre>
</div>
</div>
</body>
</html>