WordPress 4.7-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / file.php

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index face9164b48904870b1d5de1d359b67bb9159182..079e1ae892500a20ed9f7f8ece408d7637c5a4be 100644 (file)
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -77,9 +77,10 @@ $wp_file_descriptions = array(
 function get_file_description( $file ) {
        global $wp_file_descriptions, $allowed_files;
 
-       $relative_pathinfo = pathinfo( $file );
+       $dirname = pathinfo( $file, PATHINFO_DIRNAME );
+
        $file_path = $allowed_files[ $file ];
-       if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
+       if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $dirname ) {
                return $wp_file_descriptions[ basename( $file ) ];
        } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
                $template_data = implode( '', file( $file_path ) );
@@ -1260,7 +1261,7 @@ foreach ( (array) $extra_fields as $field ) {
 ?>
        <p class="request-filesystem-credentials-action-buttons">
                <button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
-               <?php submit_button( __( 'Proceed' ), 'button', 'upgrade', false ); ?>
+               <?php submit_button( __( 'Proceed' ), '', 'upgrade', false ); ?>
        </p>
 </div>
 </form>