Also close the dirhandler and fix one return value
bug: 46447
Change-Id: I0abe540d66375e6833640bb234e62b6cc902beb0
*/
public function findExtensions() {
if( $this->getVar( 'IP' ) === null ) {
- return false;
+ return array();
}
- $exts = array();
$extDir = $this->getVar( 'IP' ) . '/extensions';
- $dh = opendir( $extDir );
+ if ( !is_readable( $extDir ) || !is_dir( $extDir ) ) {
+ return array();
+ }
+ $dh = opendir( $extDir );
+ $exts = array();
while ( ( $file = readdir( $dh ) ) !== false ) {
if( !is_dir( "$extDir/$file" ) ) {
continue;
$exts[] = $file;
}
}
+ closedir( $dh );
natcasesort( $exts );
return $exts;