https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105677
Revision: 105677
Author: aaron
Date: 2011-12-09 16:21:14 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Catch exception in getFileList() for bad directories (tests were failing)
Modified Paths:
--------------
branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
Modified:
branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
===================================================================
--- branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
2011-12-09 16:13:20 UTC (rev 105676)
+++ branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
2011-12-09 16:21:14 UTC (rev 105677)
@@ -453,7 +453,12 @@
if ( $dir === null ) { // invalid storage path
return array(); // empty result
}
- return new RecursiveIteratorIterator( new
RecursiveDirectoryIterator( $dir ) );
+ try {
+ $iter = new RecursiveIteratorIterator( new
RecursiveDirectoryIterator( $dir ) );
+ } catch ( UnexpectedValueException $e ) {
+ $iter = array(); // dir does not exist?
+ }
+ return $iter;
}
function getLocalReference( array $params ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
