X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=a650aa0b0efc51e0e72182b839781afc1a2d6caf;hb=4fd1f42d0b8f61fa970a5e1dbb37a0979a11e537;hp=46d54744785b2e6d3b0aec708b784efcd2b0e755;hpb=9ba3fca2d8adc56787c8efc32c41424cb212e387;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index 46d5474478..a650aa0b0e 100644 --- a/maintenance/mergeMessageFileList.php +++ b/maintenance/mergeMessageFileList.php @@ -81,7 +81,12 @@ class MergeMessageFileList extends Maintenance { # Now find out files in a directory if ( $this->hasOption( 'extensions-dir' ) ) { $extdir = $this->getOption( 'extensions-dir' ); - $entries = scandir( $extdir ); + # Allow multiple directories to be passed with ":" as delimiter + $extdirs = explode( ':', $extdir ); + $entries = []; + foreach ( $extdirs as $extdir ) { + $entries = array_merge( $entries, scandir( $extdir ) ); + } foreach ( $entries as $extname ) { if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) { continue;