Wordpress 3.1.1

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-filesystem-ssh2.php

diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 0337658c9dca1ae8aaea252968d32ef522422037..f5a64021cd6375b15e25eaf6b06933071078ff37 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -73,7 +73,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                else
                        $this->options['hostname'] = $opt['hostname'];
 
-               if ( isset($opt['base']) && ! empty($opt['base']) )
+               if ( ! empty($opt['base']) )
                        $this->wp_base = $opt['base'];
 
                // Check if the options provided are OK.
@@ -160,14 +160,18 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
        }
 
-       function put_contents($file, $contents, $type = '' ) {
+       function put_contents($file, $contents, $mode = false ) {
                $file = ltrim($file, '/');
-               return false !== file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+               $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+
+               $this->chmod($file, $mode);
+
+               return false !== $ret;
        }
 
        function cwd() {
                $cwd = $this->run_command('pwd');
-               if( $cwd )
+               if ( $cwd )
                        $cwd = trailingslashit($cwd);
                return $cwd;
        }
@@ -235,10 +239,10 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        function copy($source, $destination, $overwrite = false ) {
-               if( ! $overwrite && $this->exists($destination) )
+               if ( ! $overwrite && $this->exists($destination) )
                        return false;
                $content = $this->get_contents($source);
-               if( false === $content)
+               if ( false === $content)
                        return false;
                return $this->put_contents($destination, $content);
        }