Ticket #10424: 10424.diff

wp-admin/includes/file.php

@@ -773 +773 @@
 function get_filesystem_method($args = array(), $context = false) {
         $method = defined('FS_METHOD') ? FS_METHOD : false; //Please ensure that this is either 'direct', 'ssh', 'ftpext' or 'ftpsockets'
 
-        if ( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){
-                if ( !$context )
-                        $context = WP_CONTENT_DIR;
-                $context = trailingslashit($context);
-                $temp_file_name = $context . 'temp-write-test-' . time();
-                $temp_handle = @fopen($temp_file_name, 'w');
-                if ( $temp_handle ) {
-                        if ( getmyuid() == @fileowner($temp_file_name) )
-                                $method = 'direct';
-                        @fclose($temp_handle);
-                        @unlink($temp_file_name);
+        if ( !$context )
+                $context = WP_CONTENT_DIR;
+
+        if ( ! $method && function_exists('fileowner') && is_writable($context) ) {             
+                $owner = @fileowner(__FILE__);
+                if ( false !== $owner ) { 
+                        $context = trailingslashit($context);
+                        $temp_file_name = $context . 'temp-write-test-' . time();
+                        $temp_handle = @fopen($temp_file_name, 'w');
+                        if ( $temp_handle ) {
+                                $php_owner = @fileowner($temp_file_name);
+                                if ( $php_owner === $owner ) // Success
+                                        $method = 'direct';
+                                @fclose($temp_handle);
+                                @unlink($temp_file_name);
+                        }
                 }
         }