Demon has submitted this change and it was merged.
Change subject: Installer: Check if /extensions is readable and a directory
......................................................................
Installer: Check if /extensions is readable and a directory
Also close the dirhandler and fix one return value
bug: 46447
Change-Id: I0abe540d66375e6833640bb234e62b6cc902beb0
---
M includes/installer/Installer.php
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Demon: Looks good to me, approved
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7ff1ff5..8aee15c 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1320,13 +1320,16 @@
*/
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;
@@ -1335,6 +1338,7 @@
$exts[] = $file;
}
}
+ closedir( $dh );
natcasesort( $exts );
return $exts;
--
To view, visit https://gerrit.wikimedia.org/r/55289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0abe540d66375e6833640bb234e62b6cc902beb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
