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

Timestamp:

08/15/2013 05:59:36 AM (11 years ago)

Author:

dd32

Message:

WP_Filesystem: Make WP_Filesystem_Base::search_for_folder() a bit more usable on the command-line when the $verbose mode is used, additionally, bail early from the function rather than repeating itself if the CWD is the root directory already.

File:

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

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

@@ -193 +193 @@
         $folder = untrailingslashit($folder);
 
+        if ( $this->verbose )
+            printf( "\n" . __('Looking for %1$s in %2$s') . "<br/>\n", $folder, $base );
+
         $folder_parts = explode('/', $folder);
-        $last_index = array_pop( array_keys( $folder_parts ) );
+        $folder_part_keys = array_keys( $folder_parts );
+        $last_index = array_pop( $folder_part_keys );
         $last_path = $folder_parts[ $last_index ];
 
@@ -211 +215 @@
                 $newdir = trailingslashit(path_join($base, $key));
                 if ( $this->verbose )
-                    printf( __('Changing to %s') . '<br/>', $newdir );
+                    printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir );
                 // only search for the remaining path tokens in the directory, not the full path again
                 $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
@@ -222 +226 @@
         if (isset( $files[ $last_path ] ) ) {
             if ( $this->verbose )
-                printf( __('Found %s') . '<br/>',  $base . $last_path );
+                printf( "\n" . __('Found %s') . "<br/>\n",  $base . $last_path );
             return trailingslashit($base . $last_path);
         }
-        if ( $loop )
-            return false; //Prevent this function from looping again.
-        //As an extra last resort, Change back to / if the folder wasn't found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
-        return $this->search_for_folder($folder, '/', true);
+
+        // Prevent this function from looping again.
+        // No need to proceed if we've just searched in /
+        if ( $loop || '/' == $base )
+            return false;
+
+        // As an extra last resort, Change back to / if the folder wasn't found.
+        // This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
+        return $this->search_for_folder( $folder, '/', true );
 
     }