diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 22d475c2e2..9f05a9a05c 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -120,7 +120,50 @@ if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?> - + + + + + 'WPLANG', + 'id' => 'WPLANG', + 'selected' => $locale, + 'languages' => $languages, + 'translations' => $translations, + 'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(), + ) ); + + // Add note about deprecated WPLANG constant. + if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) { + if ( is_super_admin() ) { + ?> +

+ WPLANG', 'wp-config.php' ); ?> +

+ + + + - - - - - - 'WPLANG', - 'id' => 'WPLANG', - 'selected' => $locale, - 'languages' => $languages, - 'translations' => $translations, - 'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(), - ) ); - - // Add note about deprecated WPLANG constant. - if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) { - if ( is_super_admin() ) { - ?> -

- WPLANG', 'wp-config.php' ); ?> -

- - - - diff --git a/wp-includes/version.php b/wp-includes/version.php index d53cdedc07..1d737aa2b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.8-alpha-39884'; +$wp_version = '4.8-alpha-39885'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.