WordPress 4.5-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / class-ftp-pure.php

diff --git a/wp-admin/includes/class-ftp-pure.php b/wp-admin/includes/class-ftp-pure.php
index bb7742abec9b6b186d95a4450b49ef92af1504ab..28e56779f97edd2607b1c578ff6ef39cdaac05b3 100644 (file)
--- a/wp-admin/includes/class-ftp-pure.php
+++ b/wp-admin/includes/class-ftp-pure.php
@@ -27,14 +27,14 @@
  */
 class ftp extends ftp_base {
 
-       function ftp($verb=FALSE, $le=FALSE) {
-               $this->__construct($verb, $le);
-       }
-
        function __construct($verb=FALSE, $le=FALSE) {
                parent::__construct(false, $verb, $le);
        }
 
+       function ftp($verb=FALSE, $le=FALSE) {
+               $this->__construct($verb, $le);
+       }
+
 // <!-- --------------------------------------------------------------------------------------- -->
 // <!--       Private functions                                                                 -->
 // <!-- --------------------------------------------------------------------------------------- -->
@@ -110,7 +110,7 @@ class ftp extends ftp_base {
                                $this->_data_close();
                                return FALSE;
                        }
-                       $ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
+                       $ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
                        $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
             $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
                        $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);