Ticket #25572: 25572.3.diff

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

@@ -1504 +1504 @@
 
                 $check_dirs = array_unique( $check_dirs );
 
+                $checkout = false;
                 // Search all directories we've found for evidence of version control.
-                foreach ( $vcs_dirs as $vcs_dir ) {
-                        foreach ( $check_dirs as $check_dir ) {
-                                if ( $checkout = is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
+                foreach ( $check_dirs as $check_dir ) {
+                        if ( ! @is_dir( $check_dir ) )
+                                break;
+                        foreach ( $vcs_dirs as $vcs_dir ) {
+                                if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
                                         break 2;
                         }
                 }