Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 07:07:38 +02:00
Code Issues Projects Releases Wiki Activity

Using let's properly in inline comments lets us move on to more pressing matters of inline documentation.

Browse Source 
Props trepmal.
Fixes #30570.

Built from https://develop.svn.wordpress.org/trunk@30703


git-svn-id: http://core.svn.wordpress.org/trunk@30693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-12-02 04:43:22 +00:00
parent 511489d7e4
commit c4b9da857a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-filesystem-base.php
View File

@ -317,7 +317,7 @@ class WP_Filesystem_Base {
*/ */
if ( isset($files[ $key ]) ){ if ( isset($files[ $key ]) ){
// Lets try that folder: // Let's try that folder:
$newdir = trailingslashit(path_join($base, $key)); $newdir = trailingslashit(path_join($base, $key));
if ( $this->verbose ) if ( $this->verbose )
printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir ); printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir );

8
wp-admin/includes/class-wp-upgrader.php
View File

@ -707,7 +707,7 @@ class Plugin_Upgrader extends WP_Upgrader {
return $source; return $source;
$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source); $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation. if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
return $source; return $source;
// Check the folder contains at least 1 valid plugin. // Check the folder contains at least 1 valid plugin.
@ -850,7 +850,7 @@ class Theme_Upgrader extends WP_Upgrader {
return $install_result; return $install_result;
} }
// We don't have the parent theme, lets install it // We don't have the parent theme, let's install it.
$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth. $api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
if ( ! $api || is_wp_error($api) ) { if ( ! $api || is_wp_error($api) ) {
@ -1095,7 +1095,7 @@ class Theme_Upgrader extends WP_Upgrader {
// Check the folder contains a valid theme // Check the folder contains a valid theme
$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source); $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation. if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
return $source; return $source;
// A proper archive should have a style.css file in the single subdirectory // A proper archive should have a style.css file in the single subdirectory
@ -2101,7 +2101,7 @@ class WP_Automatic_Updater {
$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) ); $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
} }
// Core doesn't output this, so lets append it so we don't get confused. // Core doesn't output this, so let's append it so we don't get confused.
if ( 'core' == $type ) { if ( 'core' == $type ) {
if ( is_wp_error( $upgrade_result ) ) { if ( is_wp_error( $upgrade_result ) ) {
$skin->error( __( 'Installation Failed' ), $upgrade_result ); $skin->error( __( 'Installation Failed' ), $upgrade_result );

2
wp-includes/class-wp.php
View File

@ -205,7 +205,7 @@ class WP {
preg_match("#^$match#", urldecode($request_match), $matches) ) { preg_match("#^$match#", urldecode($request_match), $matches) ) {
if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
// this is a verbose page match, lets check to be sure about it // This is a verbose page match, let's check to be sure about it.
if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
continue; continue;
} }

2
wp-includes/rewrite.php
View File

@ -363,7 +363,7 @@ function url_to_postid($url) {
if ( preg_match("#^$match#", $request_match, $matches) ) { if ( preg_match("#^$match#", $request_match, $matches) ) {
if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
// this is a verbose page match, lets check to be sure about it // This is a verbose page match, let's check to be sure about it.
if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
continue; continue;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30702'; $wp_version = '4.1-beta2-30703';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.