X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportImages.php;h=782f502dec7b0e672805a29539c9ddf68fe17afd;hb=28fb4f671c42e788a57944534655c05aa5afeb81;hp=d94b9485767ab28c360245c06db84a3f64e62416;hpb=83783cd93399fd7526aacf629e448ad3fa80e23c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index d94b948576..782f502dec 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -64,7 +64,7 @@ $extensions = isset( $options['extensions'] )
 	: $wgFileExtensions;
 
 # Search the path provided for candidates for import
-$files = findFiles( $dir, $extensions );
+$files = findFiles( $dir, $extensions, isset( $options['search-recursively'] ) );
 
 # Initialise the user for this operation
 $user = isset( $options['user'] )
@@ -332,6 +332,7 @@ Options:
 --from=<name>           Ignore all files until the one with the given name. Useful for resuming
                         aborted imports. <name> should be the file's canonical database form.
 --skip-dupes            Skip images that were already uploaded under a different name (check SHA1)
+--search-recursively    Search recursively for files in subdirectories
 --sleep=<sec>           Sleep between files. Useful mostly for debugging.
 --user=<username>       Set username of uploader, default 'Maintenance script'
 --check-userblock       Check if the user got blocked during import.