Make WordPress Core

Ticket #29397: 29397.2.patch

File 29397.2.patch, 2.4 KB (added by ocean90, 12 years ago)
  • src/wp-admin/includes/translation-install.php

     
    204204        $skin = new Automatic_Upgrader_Skin;
    205205        $upgrader = new Language_Pack_Upgrader( $skin );
    206206        $translation->type = 'core';
    207         /**
    208          * @todo failures (such as non-direct FS)
    209          */
    210207        $result = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
     208
     209        if ( ! $result || is_wp_error( $result ) ) {
     210                return false;
     211        }
     212
    211213        return $translation->language;
    212214}
     215
     216/**
     217 * Check if WordPress has access to the filesystem without asking for
     218 * credentials.
     219 *
     220 * @since 4.0.0
     221 *
     222 * @return bool Returns true on success, false on failure.
     223 */
     224function wp_can_install_language_pack() {
     225        if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
     226                return false;
     227        }
     228
     229        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
     230        $skin = new Automatic_Upgrader_Skin;
     231        $upgrader = new Language_Pack_Upgrader( $skin );
     232
     233        $check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
     234
     235        if ( ! $check || is_wp_error( $check ) ) {
     236                return false;
     237        }
     238
     239        return true;
     240}
  • src/wp-admin/install.php

     
    189189switch($step) {
    190190        case 0: // Step 0
    191191
    192                 if ( empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) {
     192                if ( wp_can_install_language_pack() && empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) {
    193193                        display_header( 'language-chooser' );
    194194                        echo '<form id="setup" method="post" action="?step=1">';
    195195                        wp_install_language_form( $languages );
  • src/wp-admin/setup-config.php

     
    9595}
    9696switch($step) {
    9797        case -1:
    98                 if ( empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
     98                if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
    9999                        setup_config_display_header( 'language-chooser' );
    100100                        echo '<form id="setup" method="post" action="?step=0">';
    101101                        wp_install_language_form( $languages );