Ticket #30570: lets.diff
File lets.diff, 3.7 KB (added by , 10 years ago) |
---|
-
wp-admin/includes/class-wp-filesystem-base.php
317 317 */ 318 318 if ( isset($files[ $key ]) ){ 319 319 320 // Let s try that folder:320 // Let's try that folder: 321 321 $newdir = trailingslashit(path_join($base, $key)); 322 322 if ( $this->verbose ) 323 323 printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir ); -
wp-admin/includes/class-wp-upgrader.php
707 707 return $source; 708 708 709 709 $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, let s not prevent installation.710 if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation. 711 711 return $source; 712 712 713 713 // Check the folder contains at least 1 valid plugin. … … 850 850 return $install_result; 851 851 } 852 852 853 // We don't have the parent theme, let s install it853 // We don't have the parent theme, let's install it 854 854 $api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth. 855 855 856 856 if ( ! $api || is_wp_error($api) ) { … … 1095 1095 1096 1096 // Check the folder contains a valid theme 1097 1097 $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, let s not prevent installation.1098 if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation. 1099 1099 return $source; 1100 1100 1101 1101 // A proper archive should have a style.css file in the single subdirectory … … 2101 2101 $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) ); 2102 2102 } 2103 2103 2104 // Core doesn't output this, so let s 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. 2105 2105 if ( 'core' == $type ) { 2106 2106 if ( is_wp_error( $upgrade_result ) ) { 2107 2107 $skin->error( __( 'Installation Failed' ), $upgrade_result ); -
wp-includes/class-wp.php
205 205 preg_match("#^$match#", urldecode($request_match), $matches) ) { 206 206 207 207 if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { 208 // this is a verbose page match, let s check to be sure about it208 // this is a verbose page match, let's check to be sure about it 209 209 if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) 210 210 continue; 211 211 } -
wp-includes/rewrite.php
363 363 if ( preg_match("#^$match#", $request_match, $matches) ) { 364 364 365 365 if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { 366 // this is a verbose page match, let s check to be sure about it366 // this is a verbose page match, let's check to be sure about it 367 367 if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) 368 368 continue; 369 369 }