summaryrefslogtreecommitdiffstats
path: root/wp-admin/options-general.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-09 15:17:25 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-09 15:17:25 +0000
commit492aa4ee7086ed94cb2f37a2bce3b52905841659 (patch)
tree825b6d0ae66246bae7a65c1f610a65b59789a6b5 /wp-admin/options-general.php
parent359223a4711934ea6ec20e4c7613832e1f1132b5 (diff)
downloadwordpress-mu-492aa4ee7086ed94cb2f37a2bce3b52905841659.tar.gz
wordpress-mu-492aa4ee7086ed94cb2f37a2bce3b52905841659.tar.xz
wordpress-mu-492aa4ee7086ed94cb2f37a2bce3b52905841659.zip
WP Merge to rev 5007
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@909 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/options-general.php')
-rw-r--r--wp-admin/options-general.php16
1 files changed, 6 insertions, 10 deletions
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 8a8fe3b..2142f73 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -42,18 +42,14 @@ include('./admin-header.php');
<?php
$lang_files = glob( ABSPATH . WPINC . "/languages/*" );
$lang = get_option( "WPLANG" );
-if( $lang == false ) {
- $lang = get_site_option( "WPLANG" );
- add_option( "WPLANG", $lang );
-}
-if( is_array( $lang_files ) && count($lang_files) => 1 ) {
+if( is_array( $lang_files ) && count($lang_files) >= 1 ) {
?>
- <tr valign="top">
- <th width="33%" scope="row"><?php _e('Language:') ?></th>
- <td><select name="WPLANG" id="WPLANG">
- <?php
- echo "<option value=''>Default</option>";
+ <tr valign="top">
+ <th width="33%" scope="row"><?php _e('Language:') ?></th>
+ <td><select name="WPLANG" id="WPLANG">
+ <?php
+ echo "<option value=''>Default</option>";
while( list( $key, $val ) = each( $lang_files ) ) {
$l = basename( $val, ".mo" );
echo "<option value='$l'";