diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-12 17:09:12 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-12 17:09:12 -0500 |
| commit | 94a3dc5ff7292c8271dfcff9408aa89d401b72ac (patch) | |
| tree | 6c7bd95bc177a40ee8f7e81fc3f2333c53363a8d /phpBB/install/install_update.php | |
| parent | 3d79ce28031b4c85ee34bd4d43f0c64b18b1a80b (diff) | |
| parent | f1a692a5f45d993fe2578f13d365ca10543696f8 (diff) | |
| download | forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.gz forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.bz2 forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.xz forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 88b00f1cf1..8c044550f3 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -862,7 +862,14 @@ class install_update extends module $test_connection = false; if ($test_ftp_connection || $submit) { - $transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); + $transfer = new $method( + request_var('host', ''), + request_var('username', ''), + htmlspecialchars_decode($request->untrimmed_variable('password', '')), + request_var('root_path', ''), + request_var('port', ''), + request_var('timeout', '') + ); $test_connection = $transfer->open_session(); // Make sure that the directory is correct by checking for the existence of common.php @@ -948,7 +955,14 @@ class install_update extends module } else { - $transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); + $transfer = new $method( + request_var('host', ''), + request_var('username', ''), + htmlspecialchars_decode($request->untrimmed_variable('password', '')), + request_var('root_path', ''), + request_var('port', ''), + request_var('timeout', '') + ); $transfer->open_session(); } |