From 1f18095da69b5e5c848f025d86940557d012cfd0 Mon Sep 17 00:00:00 2001
From: nbachiyski <nbachiyski@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 3 May 2010 22:06:49 +0000
Subject: [PATCH] Use get_available_languages() in options-general.php instead
 of manually looping on the language dir. Props sivel. Fixes #13023

git-svn-id: http://svn.automattic.com/wordpress/trunk@14416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 674891eb2..0d1ee891c 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -310,27 +310,19 @@ endfor;
 </tr>
 <?php do_settings_fields('general', 'default'); ?>
 <?php
-
-$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) ) {
+	$languages = get_available_languages();
+	if ( is_multisite() && !empty( $languages ) ):
 ?>
 	<tr valign="top">
 		<th width="33%" scope="row"><?php _e('Site language:') ?></th>
 		<td>
 			<select name="WPLANG" id="WPLANG">
-				<?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?>
+				<?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
 			</select>
 		</td>
 	</tr>
 <?php
-} // languages
+	endif;
 ?>
 </table>