X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/includes/file.php
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 04bb4039..9ff24384 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -65,7 +65,7 @@ function get_file_description( $file ) {
return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
}
- return basename( $file );
+ return trim( basename( $file ) );
}
/**
@@ -81,7 +81,7 @@ function get_home_path() {
$siteurl = get_option( 'siteurl' );
if ( $home != '' && $home != $siteurl ) {
$wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */
- $pos = strpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
+ $pos = strrpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
$home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);
$home_path = trailingslashit( $home_path );
} else {
@@ -157,7 +157,7 @@ function list_files( $folder = '', $levels = 100 ) {
* Please note that the calling function must unlink() this itself.
*
* The filename is based off the passed parameter or defaults to the current unix timestamp,
- * while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
+ * while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
*
* @since 2.6.0
*
@@ -240,7 +240,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
// You may define your own function and pass the name in $overrides['upload_error_handler']
$upload_error_handler = 'wp_handle_upload_error';
- // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
+ // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] )
return $upload_error_handler( $file, $file['error'] );
@@ -261,7 +261,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
__( "Failed to write file to disk." ),
__( "File upload stopped by extension." ));
- // All tests are on by default. Most can be turned off by $override[{test_name}] = false;
+ // All tests are on by default. Most can be turned off by $overrides[{test_name}] = false;
$test_form = true;
$test_size = true;
$test_upload = true;
@@ -343,8 +343,8 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
}
/**
- * Handle sideloads, which is the process of retriving a media item from another server instead of
- * a traditional media upload. This process involves sanitizing the filename, checking extensions
+ * Handle sideloads, which is the process of retrieving a media item from another server instead of
+ * a traditional media upload. This process involves sanitizing the filename, checking extensions
* for mime type, and moving the file to the appropriate directory within the uploads directory.
*
* @since 2.6.0
@@ -387,7 +387,7 @@ function wp_handle_sideload( &$file, $overrides = false ) {
__( "Failed to write file to disk." ),
__( "File upload stopped by extension." ));
- // All tests are on by default. Most can be turned off by $override[{test_name}] = false;
+ // All tests are on by default. Most can be turned off by $overrides[{test_name}] = false;
$test_form = true;
$test_size = true;
@@ -466,7 +466,7 @@ function wp_handle_sideload( &$file, $overrides = false ) {
/**
* Downloads a url to a local temporary file using the WordPress HTTP Class.
- * Please note, That the calling function must unlink() the file.
+ * Please note, That the calling function must unlink() the file.
*
* @since 2.5.0
*
@@ -499,7 +499,7 @@ function download_url( $url, $timeout = 300 ) {
}
/**
- * Unzip's a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
+ * Unzips a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
* Assumes that WP_Filesystem() has already been called and set up. Does not extract a root-level __MACOSX directory, if present.
*
* Attempts to increase the PHP Memory limit to 256M before uncompressing,
@@ -628,7 +628,7 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
return new WP_Error('extract_failed', __('Could not extract file from archive.'), $info['name']);
if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
- return new WP_Error('copy_failed', __('Could not copy file.'), $to . $info['filename']);
+ return new WP_Error('copy_failed', __('Could not copy file.'), $to . $info['name']);
}
$z->close();
@@ -813,7 +813,7 @@ function WP_Filesystem( $args = false, $context = false ) {
return false;
if ( !$wp_filesystem->connect() )
- return false; //There was an erorr connecting to the server.
+ return false; //There was an error connecting to the server.
// Set the permission constants if not already set.
if ( ! defined('FS_CHMOD_DIR') )
@@ -826,7 +826,7 @@ function WP_Filesystem( $args = false, $context = false ) {
/**
* Determines which Filesystem Method to use.
- * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsoxkopen())
+ * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsockopen())
*
* Note that the return value of this function can be overridden in 2 ways
* - By defining FS_METHOD in your wp-config.php
file
@@ -864,7 +864,7 @@ function get_filesystem_method($args = array(), $context = false) {
}
/**
- * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
+ * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
* All chosen/entered details are saved, Excluding the Password.
*
* Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port.
@@ -876,7 +876,7 @@ function get_filesystem_method($args = array(), $context = false) {
* @param string $form_post the URL to post the form to
* @param string $type the chosen Filesystem method in use
* @param boolean $error if the current request has failed to connect
- * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
+ * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
* @param string $extra_fields Extra POST fields which should be checked for to be included in the post.
* @return boolean False on failure. True on success.
*/
@@ -945,7 +945,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
if ( !empty($credentials) )
extract($credentials, EXTR_OVERWRITE);
if ( $error ) {
- $error_string = __('Error: There was an error connecting to the server, Please verify the settings are correct.');
+ $error_string = __('ERROR: There was an error connecting to the server, Please verify the settings are correct.');
if ( is_wp_error($error) )
$error_string = esc_html( $error->get_error_message() );
echo '
' . $error_string . '