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 "GitInfo: Fix shell restrictions for submodules"
[lhc/web/wiklou.git]
/
maintenance
/
dumpIterator.php
diff --git
a/maintenance/dumpIterator.php
b/maintenance/dumpIterator.php
index
31272bc
..
254f368
100644
(file)
--- a/
maintenance/dumpIterator.php
+++ b/
maintenance/dumpIterator.php
@@
-48,7
+48,7
@@
abstract class DumpIterator extends Maintenance {
public function execute() {
if ( !( $this->hasOption( 'file' ) ^ $this->hasOption( 'dump' ) ) ) {
public function execute() {
if ( !( $this->hasOption( 'file' ) ^ $this->hasOption( 'dump' ) ) ) {
- $this->
error( "You must provide a file or dump", true
);
+ $this->
fatalError( "You must provide a file or dump"
);
}
$this->checkOptions();
}
$this->checkOptions();
@@
-70,8
+70,8
@@
abstract class DumpIterator extends Maintenance {
if ( $this->getOption( 'dump' ) == '-' ) {
$source = new ImportStreamSource( $this->getStdin() );
} else {
if ( $this->getOption( 'dump' ) == '-' ) {
$source = new ImportStreamSource( $this->getStdin() );
} else {
- $this->
e
rror( "Sorry, I don't support dump filenames yet. "
- . "Use - and provide it on stdin on the meantime."
, true
);
+ $this->
fatalE
rror( "Sorry, I don't support dump filenames yet. "
+ . "Use - and provide it on stdin on the meantime." );
}
$importer = new WikiImporter( $source, $this->getConfig() );
}
$importer = new WikiImporter( $source, $this->getConfig() );
@@
-117,7
+117,7
@@
abstract class DumpIterator extends Maintenance {
/**
* Callback function for each revision, child classes should override
* processRevision instead.
/**
* Callback function for each revision, child classes should override
* processRevision instead.
- * @param
DatabaseBase
$rev
+ * @param
WikiRevision
$rev
*/
public function handleRevision( $rev ) {
$title = $rev->getTitle();
*/
public function handleRevision( $rev ) {
$title = $rev->getTitle();