http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88496
Revision: 88496
Author: demon
Date: 2011-05-20 22:08:04 +0000 (Fri, 20 May 2011)
Log Message:
-----------
Cleanup to extension directory checks. Saves a check for something silly like
/extensions/README/README.php
Modified Paths:
--------------
trunk/phase3/includes/installer/Installer.php
Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php 2011-05-20 22:03:10 UTC
(rev 88495)
+++ trunk/phase3/includes/installer/Installer.php 2011-05-20 22:08:04 UTC
(rev 88496)
@@ -1198,11 +1198,14 @@
}
$exts = array();
- $dir = $this->getVar( 'IP' ) . '/extensions';
- $dh = opendir( $dir );
+ $extDir = $this->getVar( 'IP' ) . '/extensions';
+ $dh = opendir( $extDir );
while ( ( $file = readdir( $dh ) ) !== false ) {
- if( file_exists( "$dir/$file/$file.php" ) ) {
+ if( !is_dir( "$extDir/$file" ) ) {
+ continue;
+ }
+ if( file_exists( "$extDir/$file/$file.php" ) ) {
$exts[] = $file;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
