From 5f76461802a5ddd41f7af33156b73c64b435f96e Mon Sep 17 00:00:00 2001 From: flourscent Date: Wed, 29 Sep 2010 08:26:03 +0000 Subject: [PATCH] =?UTF-8?q?FTP=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=ED=95=AD?= =?UTF-8?q?=EC=83=81=20=EB=81=9D=EC=9D=B4=20'/'=EB=A1=9C=20=EB=81=9D?= =?UTF-8?q?=EB=82=98=EB=8F=84=EB=A1=9D=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7739 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/install/install.admin.controller.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index 6b5028a10..270290301 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -138,7 +138,14 @@ $ftp_info->ftp_pasv = Context::get('ftp_pasv'); if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N"; $ftp_info->sftp = Context::get('sftp'); - $ftp_info->ftp_root_path = Context::get('ftp_root_path'); + + $ftp_root_path = Context::get('ftp_root_path'); + if (substr($ftp_root_path, strlen($ftp_root_path)-1) == "/") { + $ftp_info->ftp_root_path = $ftp_root_path; + } else { + $ftp_info->ftp_root_path = $ftp_root_path.'/'; + } + if(ini_get('safe_mode')) { $ftp_info->ftp_password = Context::get('ftp_password'); }