Changeset 29673

Timestamp:

09/02/2014 06:06:36 PM (11 years ago)

Author:

ocean90

Message:

Install: Only show the language chooser when we have access to the filesystem without asking for credentials.

fixes #29397.

Location:

trunk/src/wp-admin

Files:

• includes/translation-install.php (modified) (1 diff)
• install.php (modified) (1 diff)
• setup-config.php (modified) (1 diff)

trunk/src/wp-admin/includes/translation-install.php

@@ -205 +205 @@
     $upgrader = new Language_Pack_Upgrader( $skin );
     $translation->type = 'core';
-    /**
-     * @todo failures (such as non-direct FS)
-     */
     $result = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
+
+    if ( ! $result || is_wp_error( $result ) ) {
+        return false;
+    }
+
     return $translation->language;
 }
+
+/**
+ * Check if WordPress has access to the filesystem without asking for
+ * credentials.
+ *
+ * @since 4.0.0
+ *
+ * @return bool Returns true on success, false on failure.
+ */
+function wp_can_install_language_pack() {
+    if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+        return false;
+    }
+
+    require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $skin = new Automatic_Upgrader_Skin;
+    $upgrader = new Language_Pack_Upgrader( $skin );
+
+    $check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
+
+    if ( ! $check || is_wp_error( $check ) ) {
+        return false;
+    }
+
+    return true;
+}

trunk/src/wp-admin/install.php

@@ -190 +190 @@
     case 0: // Step 0
 
-        if ( empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) {
+        if ( wp_can_install_language_pack() && empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) {
             display_header( 'language-chooser' );
             echo '<form id="setup" method="post" action="?step=1">';

trunk/src/wp-admin/setup-config.php

@@ -94 +94 @@
 switch($step) {
     case -1:
-        if ( empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+        if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
             setup_config_display_header( 'language-chooser' );
             echo '<form id="setup" method="post" action="?step=0">';