From a485c33040f0ddffceb7b0489a5e6668447f21a1 Mon Sep 17 00:00:00 2001
From: Utkarsh Kukreti <utkarshkukreti@gmail.com>
Date: Fri, 13 May 2011 16:50:21 +0530
Subject: [PATCH] Fix four typos in filesystem*.php files, see #17414.
---
wp-admin/includes/class-wp-filesystem-base.php | 6 +++---
wp-admin/includes/class-wp-filesystem-direct.php | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php
index 6c072ce..546cc7f 100644
|
a
|
b
|
class WP_Filesystem_Base { |
| 21 | 21 | */ |
| 22 | 22 | var $verbose = false; |
| 23 | 23 | /** |
| 24 | | * Cached list of local filepaths to maped remote filepaths. |
| | 24 | * Cached list of local filepaths to mapped remote filepaths. |
| 25 | 25 | * |
| 26 | 26 | * @since 2.7 |
| 27 | 27 | * @access private |
| … |
… |
class WP_Filesystem_Base { |
| 215 | 215 | } |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | | //Only check this as a last resort, to prevent locating the incorrect install. All above proceeedures will fail quickly if this is the right branch to take. |
| | 218 | //Only check this as a last resort, to prevent locating the incorrect install. All above procedures will fail quickly if this is the right branch to take. |
| 219 | 219 | if (isset( $files[ $last_path ] ) ) { |
| 220 | 220 | if ( $this->verbose ) |
| 221 | 221 | printf( __('Found %s') . '<br/>', $base . $last_path ); |
| 222 | 222 | return trailingslashit($base . $last_path); |
| 223 | 223 | } |
| 224 | 224 | if ( $loop ) |
| 225 | | return false; //Prevent tihs function looping again. |
| | 225 | return false; //Prevent this function from looping again. |
| 226 | 226 | //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups. |
| 227 | 227 | return $this->search_for_folder($folder, '/', true); |
| 228 | 228 | |
diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index 0f3c7d5..9703d73 100644
|
a
|
b
|
class WP_Filesystem_Direct extends WP_Filesystem_Base { |
| 19 | 19 | /** |
| 20 | 20 | * constructor |
| 21 | 21 | * |
| 22 | | * @param mixed $arg ingored argument |
| | 22 | * @param mixed $arg ignored argument |
| 23 | 23 | */ |
| 24 | 24 | function __construct($arg) { |
| 25 | 25 | $this->method = 'direct'; |
| … |
… |
class WP_Filesystem_Direct extends WP_Filesystem_Base { |
| 222 | 222 | function delete($file, $recursive = false, $type = false) { |
| 223 | 223 | if ( empty($file) ) //Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem. |
| 224 | 224 | return false; |
| 225 | | $file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise |
| | 225 | $file = str_replace('\\', '/', $file); //for win32, occasional problems deleting files otherwise |
| 226 | 226 | |
| 227 | 227 | if ( 'f' == $type || $this->is_file($file) ) |
| 228 | 228 | return @unlink($file); |