WordPress.org

Make WordPress Core

Ticket #30570: lets.diff

File lets.diff, 3.7 KB (added by trepmal, 5 years ago)
  • wp-admin/includes/class-wp-filesystem-base.php

     
    317317                         */
    318318                        if ( isset($files[ $key ]) ){
    319319
    320                                 // Lets try that folder:
     320                                // Let's try that folder:
    321321                                $newdir = trailingslashit(path_join($base, $key));
    322322                                if ( $this->verbose )
    323323                                        printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir );
  • wp-admin/includes/class-wp-upgrader.php

     
    707707                        return $source;
    708708
    709709                $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
    710                 if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
     710                if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
    711711                        return $source;
    712712
    713713                // Check the folder contains at least 1 valid plugin.
     
    850850                        return $install_result;
    851851                }
    852852
    853                 // We don't have the parent theme, lets install it
     853                // We don't have the parent theme, let's install it
    854854                $api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
    855855
    856856                if ( ! $api || is_wp_error($api) ) {
     
    10951095
    10961096                // Check the folder contains a valid theme
    10971097                $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
    1098                 if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
     1098                if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
    10991099                        return $source;
    11001100
    11011101                // A proper archive should have a style.css file in the single subdirectory
     
    21012101                        $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
    21022102                }
    21032103
    2104                 // Core doesn't output this, so lets append it so we don't get confused.
     2104                // Core doesn't output this, so let's append it so we don't get confused.
    21052105                if ( 'core' == $type ) {
    21062106                        if ( is_wp_error( $upgrade_result ) ) {
    21072107                                $skin->error( __( 'Installation Failed' ), $upgrade_result );
  • wp-includes/class-wp.php

     
    205205                                                preg_match("#^$match#", urldecode($request_match), $matches) ) {
    206206
    207207                                                if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
    208                                                         // this is a verbose page match, lets check to be sure about it
     208                                                        // this is a verbose page match, let's check to be sure about it
    209209                                                        if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
    210210                                                                continue;
    211211                                                }
  • wp-includes/rewrite.php

     
    363363                if ( preg_match("#^$match#", $request_match, $matches) ) {
    364364
    365365                        if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
    366                                 // this is a verbose page match, lets check to be sure about it
     366                                // this is a verbose page match, let's check to be sure about it
    367367                                if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
    368368                                        continue;
    369369                        }