Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-admin/includes/class-ftp.php

@@ -278,7 +278,7 @@ function Passive($pasv=NULL) {
 	}
 
 	function SetServer($host, $port=21, $reconnect=true) {
-		if(!is_long($port)) {
+		if(!is_int($port)) {
 	        $this->verbose=true;
     	    $this->SendMSG("Incorrect port syntax");
 			return FALSE;

src/wp-includes/IXR/class-IXR-value.php

@@ -47,7 +47,7 @@ function calculateType()
         if (is_int($this->data)) {
             return 'int';
         }
-        if (is_double($this->data)) {
+        if (is_float($this->data)) {
             return 'double';
         }