Ticket #22704: 22704_r25650.diff

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

@@ -1485 +1485 @@
         }
 
         /**
-         * Check for GIT/SVN checkouts.
+         * Check for version-controlled checkouts.
          */
         static function is_vcs_checkout( $context ) {
                 $stop_dirs = array(
@@ -1495 +1495 @@
                 if ( ! file_exists( ABSPATH . '/wp-config.php' ) ) // wp-config.php up one folder in a deployment situation
                         $stop_dirs[] = dirname( ABSPATH );
 
+                $vcs_dirs = array(
+                        '.bzr', // Bazaar
+                        '.git', // Git
+                        '.hg',  // Mercurial
+                        '.svn', // Subversion
+                );
+
                 $checkout = false;
                 foreach ( array_unique( $stop_dirs ) as $dir ) {
-                        if ( file_exists( $dir . '/.svn' ) || file_exists( $dir . '/.git' ) || file_exists( $dir . '/.hg' ) || file_exists( $dir . '/.bzr' ) ) {
-                                $checkout = true;
-                                break;
+                        foreach( $vcs_dirs as $vcs_dir ) {
+                                if ( file_exists( $dir . '/' . $vcs_dir ) ) {
+                                        $checkout = true;
+                                        break;
+                                }
                         }
                 }
                 return apply_filters( 'auto_upgrade_is_vcs_checkout', $checkout, $context );
@@ -1640 +1649 @@
                                                 $item->language
                                         );
                                 }
-                                
+
                                 break;
                 }
 
@@ -1688 +1697 @@
                         return;
 
                 // Don't automatically run these thins, as we'll handle it ourselves
-                remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20, 3 ); 
-                remove_action( 'upgrader_process_complete', 'wp_version_check' ); 
-                remove_action( 'upgrader_process_complete', 'wp_update_plugins' ); 
-                remove_action( 'upgrader_process_complete', 'wp_update_themes' ); 
+                remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20, 3 );
+                remove_action( 'upgrader_process_complete', 'wp_version_check' );
+                remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
+                remove_action( 'upgrader_process_complete', 'wp_update_themes' );
 
                 // Next, Plugins
                 wp_update_plugins(); // Check for Plugin updates
@@ -1850 +1859 @@
 
                 wp_mail( get_site_option( 'admin_email' ), $subject, implode( "\n", $body ) );
         }
-}
- No newline at end of file
+}