Changeset 25057

Timestamp:

08/20/2013 06:46:37 AM (13 years ago)

Author:

dd32

Message:

WP_Filesystem: Use the FTP_* path override constants during upgrades for prefixed paths, ie. use FTP_BASE for ABSPATH/sub-dir as well as just for ABSPATH/. Props vericgar for initial patch. See #14401

File:

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

trunk/src/wp-admin/includes/class-wp-filesystem-base.php

@@ -148 +148 @@
         function find_folder($folder) {
 
-                if ( strpos($this->method, 'ftp') !== false ) {
-                        $constant_overrides = array( 'FTP_BASE' => ABSPATH, 'FTP_CONTENT_DIR' => WP_CONTENT_DIR, 'FTP_PLUGIN_DIR' => WP_PLUGIN_DIR, 'FTP_LANG_DIR' => WP_LANG_DIR );
-                        foreach ( $constant_overrides as $constant => $dir )
-                                if ( defined($constant) && $folder === $dir )
-                                        return trailingslashit(constant($constant));
+                if ( isset( $this->cache[ $folder ] ) )
+                        return $this->cache[ $folder ];
+
+                if ( stripos($this->method, 'ftp') !== false ) {
+                        $constant_overrides = array(
+                                'FTP_BASE' => ABSPATH,
+                                'FTP_CONTENT_DIR' => WP_CONTENT_DIR,
+                                'FTP_PLUGIN_DIR' => WP_PLUGIN_DIR,
+                                'FTP_LANG_DIR' => WP_LANG_DIR
+                        );
+
+                        // Direct matches ( folder = CONSTANT/ )
+                        foreach ( $constant_overrides as $constant => $dir ) {
+                                if ( ! defined( $constant ) )
+                                        continue;
+                                if ( $folder === $dir )
+                                        return trailingslashit( constant( $constant ) );
+                        }
+
+                        // Prefix Matches ( folder = CONSTANT/subdir )
+                        foreach ( $constant_overrides as $constant => $dir ) {
+                                if ( ! defined( $constant ) )
+                                        continue;
+                                if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir
+                                        $potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
+                                        $potential_folder = trailingslashit( $potential_folder );
+
+                                        if ( $this->is_dir( $potential_folder ) ) {
+                                                $this->cache[ $folder ] = $potential_folder;
+                                                return $potential_folder;
+                                        }
+                                }
+                        }
                 } elseif ( 'direct' == $this->method ) {
                         $folder = str_replace('\\', '/', $folder); //Windows path sanitisation