Ticket #25572: 25572.diff

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

@@ -1468 +1468 @@
 class WP_Automatic_Upgrader {
 
         static $upgrade_results = array();
+        static $open_basedir_triggered = false;
 
         static function upgrader_disabled() {
                 // That's a no if you don't want files changes
@@ -1505 +1506 @@
                 $check_dirs = array_unique( $check_dirs );
 
                 // Search all directories we've found for evidence of version control.
-                foreach ( $vcs_dirs as $vcs_dir ) {
-                        foreach ( $check_dirs as $check_dir ) {
+                // If we run into a safe_mode or open_basedir restriction, bail.
+                ini_set('open_basedir', '/Users/nacin/Sites/develop/build/');
+                set_error_handler( array( __CLASS__, 'error_handler' ), E_WARNING );
+                foreach ( $check_dirs as $check_dir ) {
+                        foreach ( $vcs_dirs as $vcs_dir ) {
                                 if ( $checkout = is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
                                         break 2;
+                                if ( self::open_basedir_triggered() )
+                                        break;
+
                         }
                 }
+                restore_error_handler();
                 return apply_filters( 'auto_upgrade_is_vcs_checkout', $checkout, $context );
         }
 
+        static function error_handler( $errno, $errstr, $errfile, $errline, $errcontext ) {
+                if ( 0 === strpos( $errstr, 'is_dir(): open_basedir' ) ) {
+                        self::$open_basedir_triggered = true;
+                        return;
+                }
+                return false;
+        }
+
+        static function open_basedir_triggered() {
+                return self::$open_basedir_triggered;
+        }
+
         /**
          * Tests to see if we should upgrade a specific item, does not test to see if we CAN update the item.
          */