dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Disable $wgServer autodetection to prevent cache poisoning attacks" into REL1_34
[lhc/web/wiklou.git]
/
maintenance
/
mergeMessageFileList.php
diff --git
a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index
80e72fb
..
d78c5a0
100644
(file)
--- a/
maintenance/mergeMessageFileList.php
+++ b/
maintenance/mergeMessageFileList.php
@@
-129,7
+129,6
@@
class MergeMessageFileList extends Maintenance {
$files = [];
$fileLines = file( $fileName );
if ( $fileLines === false ) {
$files = [];
$fileLines = file( $fileName );
if ( $fileLines === false ) {
- $this->hasError = true;
$this->error( "Unable to open list file $fileName." );
return $files;
$this->error( "Unable to open list file $fileName." );
return $files;
@@
-144,7
+143,6
@@
class MergeMessageFileList extends Maintenance {
if ( file_exists( $extension ) ) {
$files[] = $extension;
} else {
if ( file_exists( $extension ) ) {
$files[] = $extension;
} else {
- $this->hasError = true;
$this->error( "Extension {$extension} doesn't exist" );
}
}
$this->error( "Extension {$extension} doesn't exist" );
}
}
@@
-157,6
+155,7
@@
class MergeMessageFileList extends Maintenance {
require_once RUN_MAINTENANCE_IF_MAIN;
$queue = [];
require_once RUN_MAINTENANCE_IF_MAIN;
$queue = [];
+'@phan-var string[][] $mmfl';
foreach ( $mmfl['setupFiles'] as $fileName ) {
if ( strval( $fileName ) === '' ) {
continue;
foreach ( $mmfl['setupFiles'] as $fileName ) {
if ( strval( $fileName ) === '' ) {
continue;