vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-30 18:24:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip trailing whitespace

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@10150 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-12-09 18:03:31 +00:00
parent f0f4bd82b2
commit baaaa352ba
96 changed files with 336 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wp-admin/includes/class-wp-filesystem-ssh2.php
View File

@@ -90,12 +90,12 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
$this->options['username'] = $opt['username'];
if ( ( !empty ($opt['public_key']) ) && ( !empty ($opt['private_key']) ) ) {
$this->options['public_key'] = $opt['public_key'];
$this->options['public_key'] = $opt['public_key'];
$this->options['private_key'] = $opt['private_key'];
$this->options['hostkey'] = array("hostkey" => "ssh-rsa");
$this->keys = true;
$this->keys = true;
}
@@ -105,18 +105,18 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
} else {
$this->options['password'] = $opt['password'];
}
}
function connect() {
$this->debug("connect();");
if ( ! $this->keys ) {
$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
} else {
$this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
$this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
}
if ( ! $this->link ) {
$this->errors->add('connect', sprintf(__('Failed to connect to SSH2 Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
return false;
@@ -358,7 +358,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
function touch($file, $time = 0, $atime = 0) {
//Not implmented.
}
function mkdir($path, $chmod = null, $chown = false, $chgrp = false) {
$this->debug("mkdir();");
$path = untrailingslashit($path);