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 "resourceloader: Remove redundant closure of some startup and base files"
[lhc/web/wiklou.git]
/
maintenance
/
importImages.php
diff --git
a/maintenance/importImages.php
b/maintenance/importImages.php
index
d0d8a4b
..
0c4ff0a
100644
(file)
--- a/
maintenance/importImages.php
+++ b/
maintenance/importImages.php
@@
-200,7
+200,8
@@
class ImportImages extends Maintenance {
$title = Title::makeTitleSafe( NS_FILE, $base );
if ( !is_object( $title ) ) {
$this->output(
$title = Title::makeTitleSafe( NS_FILE, $base );
if ( !is_object( $title ) ) {
$this->output(
- "{$base} could not be imported; a valid title cannot be produced\n" );
+ "{$base} could not be imported; a valid title cannot be produced\n"
+ );
continue;
}
continue;
}
@@
-246,7
+247,8
@@
class ImportImages extends Maintenance {
if ( $dupes ) {
$this->output(
if ( $dupes ) {
$this->output(
- "{$base} already exists as {$dupes[0]->getName()}, skipping\n" );
+ "{$base} already exists as {$dupes[0]->getName()}, skipping\n"
+ );
$skipped++;
continue;
}
$skipped++;
continue;
}
@@
-274,7
+276,8
@@
class ImportImages extends Maintenance {
if ( $wgUser === false ) {
# user does not exist in target wiki
$this->output(
if ( $wgUser === false ) {
# user does not exist in target wiki
$this->output(
- "failed: user '$real_user' does not exist in target wiki." );
+ "failed: user '$real_user' does not exist in target wiki."
+ );
continue;
}
}
continue;
}
}
@@
-291,7
+294,8
@@
class ImportImages extends Maintenance {
$commentText = file_get_contents( $f );
if ( !$commentText ) {
$this->output(
$commentText = file_get_contents( $f );
if ( !$commentText ) {
$this->output(
- " Failed to load comment file {$f}, using default comment. " );
+ " Failed to load comment file {$f}, using default comment. "
+ );
}
}
}
}
}
}
@@
-322,7
+326,7
@@
class ImportImages extends Maintenance {
$archive = $image->publish( $file, $flags, $publishOptions );
if ( !$archive->isGood() ) {
$this->output( "failed. (" .
$archive = $image->publish( $file, $flags, $publishOptions );
if ( !$archive->isGood() ) {
$this->output( "failed. (" .
- $archive->get
WikiText( false, false, 'en'
) .
+ $archive->get
Message( false, false, 'en' )->text(
) .
")\n" );
$failed++;
continue;
")\n" );
$failed++;
continue;