Ticket #5586: 5586.3.diff

wp-admin/includes/class-wp-filesystem-direct.php

@@ -13 +13 @@
-        function setDefaultPermissions($perm){
-                $this->permission = $perm;
-        }
-
+, $echo = false
-                return str_replace('\\','/',ABSPATH);
-        }
-
-str_replace('\\','/',ABSPATH
+, $echo = false
+find_base_dir($base, $echo
-        }
-        function get_contents($file){
-                return @file_get_contents($file);

wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -62 +62 @@
-
-        function connect(){
-                if ( $this->options['ssl'] && function_exists('ftp_ssl_connect') ) {
-
+@
-                } else {
-
+@
-                }
-
-                if ( ! $this->link ) {
@@ -72 +72 @@
-                        return false;
-                }
-
-
+@
-                        $this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
-                        return false;
-                }
@@ -119 +119 @@
-                //If we get this far, somethings gone wrong, change to / and restart the process.
-                return $this->find_base_dir('/',$echo);
-        }
-
+, $echo=false
-                if( empty($this->wp_base) )
-
+,$echo
-                return $this->wp_base;
-        }
-        function get_contents($file,$type='',$resumepos=0){
@@ -298 +298 @@
-        }
-        function is_dir($path){
-                $cwd = $this->cwd();
-
+
+
-                        @ftp_chdir($this->link, $cwd);
-                        return true;
-                }
@@ -325 +326 @@
-                return false;
-        }
-        function mkdir($path,$chmod=false,$chown=false,$chgrp=false){
-
+@
-                        return false;
-                if( $chmod )
-                        $this->chmod($path, $chmod);
@@ -337 +338 @@
-        }
-        function rmdir($path,$recursive=false){
-                if( ! $recursive )
-
+@
-
-                //TODO: Recursive Directory delete, Have to delete files from the folder first.
-                //$dir = $this->dirlist($path);

wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -122 +122 @@
-                return $this->find_base_dir('/',$echo);
-        }
-
-
+, $echo = false
-                if( empty($this->wp_base) )
-
+, $echo
-                return $this->wp_base;
-        }
-

wp-admin/includes/update.php

@@ -140 +140 @@
-        if ( $wp_filesystem->errors->get_error_code() )
-                return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
-
+        //Get the Base folder
+        $base = $wp_filesystem->get_base_dir();
+
-        // Get the URL to the zip file
-        $r = $current->response[ $plugin ];
-
@@ -148 +151 @@
-
-        // Download the package
-        $package = $r->package;
-__("Downloading update from $package"
+sprintf(__("Downloading update from %s"), $package
-        $file = download_url($package);
-
-        if ( !$file )
-                return new WP_Error('download_failed', __('Download failed.'));
-
-        $name = basename($plugin, '.php');
-ABSPATH
+$base
-
-        // Clean up working directory
-        if ( is_dir($working_dir) )
@@ -175 +178 @@
-
-        // Remove the existing plugin.
-        apply_filters('update_feedback', __("Removing the old version of the plugin"));
-
+
+
-        // If plugin is in its own directory, recursively delete the directory.
-ABSPATH
+$base
-                $deleted = $wp_filesystem->delete($plugin_dir, true);
-        else
-ABSPATH
+$base
-        if ( !$deleted ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('delete_failed', __('Could not remove the old plugin'));
@@ -188 +192 @@
-
-        apply_filters('update_feedback', __("Installing the latest version"));
-        // Copy new version of plugin into place.
-ABSPATH
+$base
-                //$wp_filesystem->delete($working_dir, true);
-                return new WP_Error('install_failed', __('Installation failed'));
-        }