<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14416] trunk/wp-admin/options-general.php: Use get_available_languages()
in options-general.php instead of manually looping on the language dir.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14416">14416</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-05-03 22:06:49 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use get_available_languages() in options-general.php instead of manually looping on the language dir. Props sivel. Fixes <a href="http://trac.wordpress.org/ticket/13023">#13023</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (14415 => 14416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-05-03 22:03:52 UTC (rev 14415)
+++ trunk/wp-admin/options-general.php 2010-05-03 22:06:49 UTC (rev 14416)
</span><span class="lines">@@ -310,27 +310,19 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php do_settings_fields('general', 'default'); ?>
</span><span class="cx"> <?php
</span><del>-
-$lang_files = array();
-if ( is_multisite() && is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) ) {
- while ( ( $lang_file = readdir( $dh ) ) !== false ) {
- if ( substr( $lang_file, -3 ) == '.mo' )
- $lang_files[] = $lang_file;
- }
-}
-
-if ( !empty($lang_files) ) {
</del><ins>+ $languages = get_available_languages();
+ if ( is_multisite() && !empty( $languages ) ):
</ins><span class="cx"> ?>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th width="33%" scope="row"><?php _e('Site language:') ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <select name="WPLANG" id="WPLANG">
</span><del>- <?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?>
</del><ins>+ <?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
</ins><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php
</span><del>-} // languages
</del><ins>+ endif;
</ins><span class="cx"> ?>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>