Changeset 20311

Timestamp:

03/29/2012 02:15:06 AM (13 years ago)

Author:

dd32

Message:

WP_Filesystem: PemFTP: Detect dl() being disabled in order to avoid any fatals which may be produced when the Sockets extension is not available. Props to kurtpayne for initial patch, Fixes #20187

File:

• trunk/wp-admin/includes/class-ftp.php (modified) (1 diff)

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

@@ -897 +897 @@
 }
 
-$mod_sockets=TRUE;
-if (!extension_loaded('sockets')) {
-    $prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : '';
-    if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=FALSE;
+$mod_sockets = extension_loaded( 'sockets' );
+if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) {
+    $prefix = ( PHP_SHLIB_SUFFIX == 'dll' ) ? 'php_' : '';
+    @dl( $prefix . 'sockets.' . PHP_SHLIB_SUFFIX );
+    $mod_sockets = extension_loaded( 'sockets' );
 }
 
-require_once "class-ftp-".($mod_sockets?"sockets":"pure").".php";
+require_once "class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
 ?>