Changeset 25700

Timestamp:

10/06/2013 03:45:09 PM (11 years ago)

Author:

nacin

Message:

Be as sure as possible that WordPress is not under version control when deciding if we should do automatic updates.

see #22704.

File:

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

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

@@ -1489 +1489 @@
      */
     static function is_vcs_checkout( $context ) {
-        $stop_dirs = array(
-            ABSPATH,
-            untrailingslashit( $context ),
-        );
-        if ( ! file_exists( ABSPATH . '/wp-config.php' ) ) // wp-config.php up one folder in a deployment situation
-            $stop_dirs[] = dirname( ABSPATH );
-
-        $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;
+        $context_dirs = array( untrailingslashit( $context ) );
+        if ( $context !== ABSPATH )
+            $context_dirs[] = untrailingslashit( ABSPATH );
+
+        $vcs_dirs = array( '.svn', '.git', '.hg', '.bzr' );
+        $check_dirs = array();
+
+        foreach ( $context_dirs as $context_dir ) {
+            // Walk up from $context_dir to the root.
+            do {
+                $check_dirs[] = $context_dir;
+            } while ( $context_dir != dirname( $context_dir ) && $context_dir = dirname( $context_dir ) );
+        }
+
+        $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 ( $checkout = is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
+                    break 2;
             }
         }