diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 14:08:54 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 14:08:54 +0000 |
| commit | 310940b824eff4a116dcd72ccd339bb602021981 (patch) | |
| tree | 19f6efc7b30b9456eebc26d578c5dc7e125bb6e7 /wp-admin/update.php | |
| parent | 616f7399dc4c4f7c56951c7b87a7aa91b3e690a3 (diff) | |
| download | wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.tar.gz wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.tar.xz wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.zip | |
Merge with branches/2.5 in WordPress, revision 8066
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/update.php')
| -rw-r--r-- | wp-admin/update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-admin/update.php b/wp-admin/update.php index 34e9380..be95102 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -22,7 +22,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false) $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']); $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']); $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']); - $credentials['ssl'] = defined('FTP_SSL') ? FTP_SSL : (!empty($_POST['ssl']) ? $_POST['ssl'] : $credentials['ssl']); + $credentials['ssl'] = defined('FTP_SSL') ? FTP_SSL : ( isset($_POST['ssl']) ? $_POST['ssl'] : $credentials['ssl']); if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) { $stored_credentials = $credentials; |