diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-07-12 15:44:43 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-07-12 15:44:43 +0000 |
| commit | 7909b729bbb1facce975b10da28754eb157723aa (patch) | |
| tree | 1301cfee49fa963d06526b430ff1a7b2a572566e /phpBB/includes/functions_transfer.php | |
| parent | 2839f3a964d214b9c2741f047cf69f1f48662462 (diff) | |
| download | forums-7909b729bbb1facce975b10da28754eb157723aa.tar forums-7909b729bbb1facce975b10da28754eb157723aa.tar.gz forums-7909b729bbb1facce975b10da28754eb157723aa.tar.bz2 forums-7909b729bbb1facce975b10da28754eb157723aa.tar.xz forums-7909b729bbb1facce975b10da28754eb157723aa.zip | |
unified the transfer routines from the updater and from acp_language.php. still needs work..
git-svn-id: file:///svn/phpbb/trunk@9751 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_transfer.php')
| -rw-r--r-- | phpBB/includes/functions_transfer.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php index a276bd304a..351f9517c5 100644 --- a/phpBB/includes/functions_transfer.php +++ b/phpBB/includes/functions_transfer.php @@ -16,7 +16,7 @@ if (!defined('IN_PHPBB')) exit; } -require_once PHPBB_ROOT_PATH . 'includes/sftp/sftp.' . PHP_EXT; +require_once PHPBB_ROOT_PATH . 'includes/libraries/sftp/sftp.' . PHP_EXT; /** * Transfer class, wrapper for ftp/sftp/ssh @@ -192,7 +192,7 @@ class transfer $directory = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $directory); $this->_chdir($directory); - $result = $this->_ls(); + $result = $this->_ls(''); if ($result !== false && is_array($result)) { @@ -455,7 +455,7 @@ class ftp extends transfer $item = str_replace('\\', '/', $item); $dir = str_replace('\\', '/', $dir); - if (strpos($item, $dir) === 0) + if (!empty($dir) && strpos($item, $dir) === 0) { $item = substr($item, strlen($dir)); } |