X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FimportImages.inc;h=2b3d5514c5c5afb67ad24839e5e0fb98671e4019;hb=0c1f2232474ad09da94979acd9de36b495642fdd;hp=ac5d14432b2aba4d688dab8e8d2050a55a14c91c;hpb=125d6d5feceba4d3d740efb5be0be83058546a20;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.inc b/maintenance/importImages.inc
index ac5d14432b..2b3d5514c5 100644
--- a/maintenance/importImages.inc
+++ b/maintenance/importImages.inc
@@ -28,9 +28,10 @@
  *
  * @param $dir string Path to directory to search
  * @param $exts Array of extensions to search for
+ * @param $recurse Bool Search subdirectories recursively
  * @return mixed Array of filenames on success, or false on failure
  */
-function findFiles( $dir, $exts ) {
+function findFiles( $dir, $exts, $recurse = false ) {
 	if ( is_dir( $dir ) ) {
 		$dhl = opendir( $dir );
 		if ( $dhl ) {
@@ -38,8 +39,11 @@ function findFiles( $dir, $exts ) {
 			while ( ( $file = readdir( $dhl ) ) !== false ) {
 				if ( is_file( $dir . '/' . $file ) ) {
 					list( /* $name */, $ext ) = splitFilename( $dir . '/' . $file );
-					if ( array_search( strtolower( $ext ), $exts ) !== false )
+					if ( array_search( strtolower( $ext ), $exts ) !== false ) {
 						$files[] = $dir . '/' . $file;
+					}
+				} elseif ( $recurse && is_dir( $dir . '/' . $file ) && $file !== '..' && $file !== '.' ) {
+					$files = array_merge( $files, findFiles( $dir . '/' . $file, $exts, true ) );
 				}
 			}
 			return $files;