Index: wp-admin/includes/class-wp-filesystem-direct.php
===================================================================
--- wp-admin/includes/class-wp-filesystem-direct.php (revision 7236)
+++ wp-admin/includes/class-wp-filesystem-direct.php (working copy)
@@ -271,7 +271,7 @@
foreach($filelist as $filename=>$det){
if ( '/' == substr($filename,-1,1) )
$this->rmdir($path.'/'.$filename,$recursive);
- @rmdir($entry);
+ @rmdir($filename);
}
return @rmdir($path);
}
@@ -333,4 +333,4 @@
return;
}
}
-?>
\ No newline at end of file
+?>
Index: wp-admin/includes/class-wp-filesystem-ftpext.php
===================================================================
--- wp-admin/includes/class-wp-filesystem-ftpext.php (revision 7236)
+++ wp-admin/includes/class-wp-filesystem-ftpext.php (working copy)
@@ -132,7 +132,7 @@
}
function get_contents($file,$type='',$resumepos=0){
if( empty($type) ){
- $extension = substr(strrchr($filename, "."), 1);
+ $extension = substr(strrchr($file, "."), 1);
$type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII;
}
$temp = tmpfile();
@@ -348,7 +348,7 @@
}
function rmdir($path,$recursive=false){
if( ! $recursive )
- return @ftp_rmdir($this->link, $file);
+ return @ftp_rmdir($this->link, $path);
//TODO: Recursive Directory delete, Have to delete files from the folder first.
//$dir = $this->dirlist($path);
Index: wp-admin/includes/class-wp-filesystem-ftpsockets.php
===================================================================
--- wp-admin/includes/class-wp-filesystem-ftpsockets.php (revision 7236)
+++ wp-admin/includes/class-wp-filesystem-ftpsockets.php (working copy)
@@ -139,7 +139,7 @@
return false;
if( empty($type) ){
- $extension = substr(strrchr($filename, "."), 1);
+ $extension = substr(strrchr($file, "."), 1);
$type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_AUTOASCII;
}
$this->ftp->SetType($type);
@@ -376,7 +376,7 @@
function rmdir($path,$recursive=false){
if( ! $recursive )
- return $this->ftp->rmdir($file);
+ return $this->ftp->rmdir($path);
return $this->ftp->mdel($path);
}
Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php (revision 7236)
+++ wp-admin/includes/file.php (working copy)
@@ -231,7 +231,7 @@
// Is the archive valid?
if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
- return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->error_string);
+ return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->errorInfo(true));
if ( 0 == count($archive_files) )
return new WP_Error('empty_archive', __('Empty archive'));
@@ -240,12 +240,9 @@
$path = explode('/', $to);
$tmppath = '';
for ( $j = 0; $j < count($path) - 1; $j++ ) {
- $prevpath = $tmppath;
$tmppath .= $path[$j] . '/';
- if ( ! $fs->is_dir($tmppath) ) {
- //$fs->setDefaultPermissions( $fs->getchmod($tmppath) );
+ if ( ! $fs->is_dir($tmppath) )
$fs->mkdir($tmppath, 0755);
- }
}
foreach ($archive_files as $file) {
Index: wp-admin/includes/update.php
===================================================================
--- wp-admin/includes/update.php (revision 7236)
+++ wp-admin/includes/update.php (working copy)
@@ -114,7 +114,7 @@
$r = $current->response[ $file ];
echo "| ";
- printf( __('There is a new version of %1$s available. Download version %3$s here or upgrade automatically.'), $plugin_data['Name'], $r->url, $r->new_version, "update.php?action=upgrade-plugin&plugin=$file" );
+ printf( __('There is a new version of %1$s available. Download version %3$s here or upgrade automatically.'), $plugin_data['Name'], $r->url, $r->new_version, wp_nonce_url("update.php?action=upgrade-plugin&plugin=$file", 'upgrade-plugin_' . $file) );
echo " |
";
}
add_action( 'after_plugin_row', 'wp_plugin_update_row' );
@@ -154,20 +154,19 @@
// Download the package
$package = $r->package;
- apply_filters('update_feedback', sprintf(__("Downloading update from %s"), $package));
+ apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package));
$file = download_url($package);
if ( !$file )
return new WP_Error('download_failed', __('Download failed.'));
- $name = basename($plugin, '.php');
- $working_dir = $base . 'wp-content/upgrade/' . $name;
+ $working_dir = $base . 'wp-content/upgrade/' . basename($plugin, '.php');
// Clean up working directory
- if ( is_dir($working_dir) )
+ if ( $wp_filesystem->is_dir($working_dir) )
$wp_filesystem->delete($working_dir, true);
- apply_filters('update_feedback', __("Unpacking the update"));
+ apply_filters('update_feedback', __('Unpacking the update'));
// Unzip package to working directory
$result = unzip_file($file, $working_dir);
if ( is_wp_error($result) ) {
@@ -180,23 +179,25 @@
unlink($file);
// Remove the existing plugin.
- apply_filters('update_feedback', __("Removing the old version of the plugin"));
+ apply_filters('update_feedback', __('Removing the old version of the plugin'));
$plugin_dir = dirname($base . PLUGINDIR . "/$plugin");
$plugin_dir = trailingslashit($plugin_dir);
+
// If plugin is in its own directory, recursively delete the directory.
- if( ! in_array( $plugin_dir, array('.', trailingslashit($base . PLUGINDIR) ) ) )
+ if( strpos($plugin, '/') && $plugin_dir != $base . PLUGINDIR . '/' )
$deleted = $wp_filesystem->delete($plugin_dir, true);
else
$deleted = $wp_filesystem->delete($base . PLUGINDIR . "/$plugin");
+
if ( !$deleted ) {
$wp_filesystem->delete($working_dir, true);
return new WP_Error('delete_failed', __('Could not remove the old plugin'));
}
- apply_filters('update_feedback', __("Installing the latest version"));
+ apply_filters('update_feedback', __('Installing the latest version'));
// Copy new version of plugin into place.
if ( !copy_dir($working_dir, $base . PLUGINDIR) ) {
- //$wp_filesystem->delete($working_dir, true);
+ //$wp_filesystem->delete($working_dir, true); //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails.
return new WP_Error('install_failed', __('Installation failed'));
}
@@ -207,4 +208,4 @@
delete_option('update_plugins');
}
-?>
+?>
\ No newline at end of file
Index: wp-admin/update.php
===================================================================
--- wp-admin/update.php (revision 7236)
+++ wp-admin/update.php (working copy)
@@ -5,14 +5,14 @@
if ( !current_user_can('edit_plugins') )
wp_die(''.__('You do not have sufficient permissions to update plugins for this blog.').'
');
-function request_filesystem_credentials($form_post, $type = '') {
+function request_filesystem_credentials($form_post, $type = '', $error = false) {
if ( empty($type) )
$type = get_filesystem_method();
if ( 'direct' == $type )
return array();
- if ( !empty($_POST['password']) && !empty($_POST['username']) && !empty($_POST['hostname']) ) {
+ if ( ! $error && !empty($_POST['password']) && !empty($_POST['username']) && !empty($_POST['hostname']) ) {
$credentials = array('hostname' => $_POST['hostname'], 'username' => $_POST['username'],
'password' => $_POST['password'], 'ssl' => $_POST['ssl']);
$stored_credentials = $credentials;
@@ -26,6 +26,9 @@
$ssl = '';
if ( $credentials = get_option('ftp_credentials') )
extract($credentials, EXTR_OVERWRITE);
+ if( $error ){
+ echo '' . __('Error: There was an error connecting to the server, Please verify the settings are correct.') . '