Make WordPress Core


Ignore:
Timestamp:
01/12/2010 09:11:52 PM (14 years ago)
Author:
wpmuguru
Message:

merge multisite admin - edit links,tags,cats,options, See #11644

Location:
trunk/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin

    • Property svn:ignore set to
      .categories.php.swp
  • trunk/wp-admin/options-general.php

    r12507 r12712  
    7171<span class="description"><?php _e('In a few words, explain what this blog is about.') ?></span></td>
    7272</tr>
     73<?php if ( !is_multisite() ) { ?>
    7374<tr valign="top">
    7475<th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
     
    9899</td>
    99100</tr>
     101<?php } else { ?>
     102<tr valign="top">
     103<th scope="row"><label for="new_admin_email"><?php _e('E-mail address') ?> </label></th>
     104<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
     105<span class="setting-description"><?php _e('This address is used for admin purposes.') ?> <?php _e('If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span></td>
     106</tr>
     107<?php } ?>
    100108<tr>
    101109<?php
     
    282290</tr>
    283291<?php do_settings_fields('general', 'default'); ?>
     292<?php
     293if ( is_multisite() && is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) )
     294    while( ( $lang_file = readdir( $dh ) ) !== false )
     295        if( substr( $lang_file, -3 ) == '.mo' )
     296            $lang_files[] = $lang_file;
     297$lang = get_option('WPLANG');
     298
     299if( is_array($lang_files) && !empty($lang_files) ) {
     300    ?>
     301    <tr valign="top">
     302        <th width="33%" scope="row"><?php _e('Blog language:') ?></th>
     303        <td>
     304            <select name="WPLANG" id="WPLANG">
     305                <?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?>
     306            </select>
     307        </td>
     308    </tr>
     309    <?php
     310} // languages
     311?>
    284312</table>
    285313
Note: See TracChangeset for help on using the changeset viewer.