aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-28 14:31:55 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-28 14:31:55 +0000
commite0a33e05bd7909e366223515600958d4303d46a8 (patch)
tree407ede381180bdaa936dff6b585909ca7daa1bdc /phpBB/includes
parent63496350392d12828ee1119241eaf0687811c70a (diff)
downloadforums-e0a33e05bd7909e366223515600958d4303d46a8.tar
forums-e0a33e05bd7909e366223515600958d4303d46a8.tar.gz
forums-e0a33e05bd7909e366223515600958d4303d46a8.tar.bz2
forums-e0a33e05bd7909e366223515600958d4303d46a8.tar.xz
forums-e0a33e05bd7909e366223515600958d4303d46a8.zip
fix for ftp update bug...
git-svn-id: file:///svn/phpbb/trunk@6689 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_transfer.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php
index 00ef78f933..3a3bb24563 100644
--- a/phpBB/includes/functions_transfer.php
+++ b/phpBB/includes/functions_transfer.php
@@ -196,7 +196,9 @@ class transfer
global $phpbb_root_path;
$directory = $this->root_path . str_replace($phpbb_root_path, '', $directory);
- $result = $this->_ls($directory);
+
+ $this->_chdir($directory);
+ $result = $this->_ls('');
if ($result !== false && is_array($result))
{
f6db5208248d466a7d443956a'>mdk-stage1 parent1ab2bcedda2529cdb752df260848536c5cd38ff7 (diff)downloaddrakx-07a152830baff25f6db5208248d466a7d443956a.tar
drakx-07a152830baff25f6db5208248d466a7d443956a.tar.gz
drakx-07a152830baff25f6db5208248d466a7d443956a.tar.bz2
drakx-07a152830baff25f6db5208248d466a7d443956a.tar.xz
drakx-07a152830baff25f6db5208248d466a7d443956a.zip
also log server name for HTTP install
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/network.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index ae2c685d2..76a89ddca 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -801,7 +801,7 @@ enum return_type http_prepare(void)
strcpy(location_full, answers[1]);
strcat(location_full, get_ramdisk_realname());
- log_message("HTTP: trying to retrieve %s", location_full);
+ log_message("HTTP: trying to retrieve %s from %s", location_full, answers[0]);
fd = http_download_file(answers[0], location_full, &size);
if (fd < 0) {