fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge sandbox to trunk for 1.4.4.1

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7743 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-30 08:12:09 +00:00
parent b8299c8a65
commit 9139515e57
23 changed files with 93 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/install/install.admin.controller.php
View file

@ -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');
}