Changes from trunk/wp-admin/includes/file.php at r10150 to branches/2.7/wp-admin/includes/file.php at r10199

File:

• branches/2.7/wp-admin/includes/file.php (modified) (2 diffs)

branches/2.7/wp-admin/includes/file.php

@@ -668 +668 @@
     $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? $_POST['private_key'] : $credentials['private_key']);
 
+    //sanitize the hostname, Some people might pass in odd-data:
+    $credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
+
     if ( strpos($credentials['hostname'], ':') )
         list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
+    else
+        unset($credentials['port']);
 
     if ( defined('FTP_SSH') || (isset($_POST['connection_type']) && 'ssh' == $_POST['connection_type']) )
@@ -680 +685 @@
     if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
         $stored_credentials = $credentials;
-        unset($stored_credentials['password'], $stored_credentials['private_key'], $stored_credentials['public_key']);
+        if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
+            $stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+
+        unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
         update_option('ftp_credentials', $stored_credentials);
         return $credentials;