Cleanup to extension directory checks. Saves a check for something silly like /extens...
authorChad Horohoe <demon@users.mediawiki.org>
Fri, 20 May 2011 22:08:04 +0000 (22:08 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Fri, 20 May 2011 22:08:04 +0000 (22:08 +0000)
includes/installer/Installer.php

index bb87390..3cfdfc3 100644 (file)
@@ -1198,11 +1198,14 @@ abstract class Installer {
                }
 
                $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;
                        }
                }