Changeset 38380 for trunk/src/wp-admin/includes/class-ftp.php

Timestamp:

08/26/2016 06:46:17 PM (10 years ago)

Author:

wonderboymusic

Message:

FTP: ensure that there is only one class named ftp, which is what is expected in the loading of this arcane library. This ensures that an autoload generator, something along the lines of Composer, won't hiccup when it gets to these files.

See #36335.

File:

• trunk/src/wp-admin/includes/class-ftp.php (modified) (2 diffs)

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

@@ -819 +819 @@
                 $sensitive=(PHP_OS!='WIN32');
                 return ($sensitive?
-                        preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) : 
+                        preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
                         preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
                 );
@@ -905 +905 @@
 
 require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
+
+if ( $mod_sockets ) {
+        class ftp extends ftp_sockets {}
+} else {
+        class ftp extends ftp_pure {}
+}