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 "Fix accidential variable overriding in manualWordsTable"
[lhc/web/wiklou.git]
/
maintenance
/
importDump.php
diff --git
a/maintenance/importDump.php
b/maintenance/importDump.php
index
7c452a6
..
f0e0555
100644
(file)
--- a/
maintenance/importDump.php
+++ b/
maintenance/importDump.php
@@
-118,7
+118,7
@@
TEXT
return;
}
return;
}
- $this->nsFilter = array_unique( array_map(
array( $this, 'getNsIndex' )
, $namespaces ) );
+ $this->nsFilter = array_unique( array_map(
[ $this, 'getNsIndex' ]
, $namespaces ) );
}
private function getNsIndex( $namespace ) {
}
private function getNsIndex( $namespace ) {
@@
-205,7
+205,7
@@
TEXT
// call_user_func( $this->uploadCallback, $revision );
$dbw = $this->getDB( DB_MASTER );
// call_user_func( $this->uploadCallback, $revision );
$dbw = $this->getDB( DB_MASTER );
- return $dbw->deadlockLoop(
array( $revision, 'importUpload' )
);
+ return $dbw->deadlockLoop(
[ $revision, 'importUpload' ]
);
}
}
}
}
@@
-297,13
+297,13
@@
TEXT
return false;
}
}
return false;
}
}
- $importer->setPageCallback(
array( &$this, 'reportPage' )
);
+ $importer->setPageCallback(
[ $this, 'reportPage' ]
);
$this->importCallback = $importer->setRevisionCallback(
$this->importCallback = $importer->setRevisionCallback(
-
array( &$this, 'handleRevision' )
);
+
[ $this, 'handleRevision' ]
);
$this->uploadCallback = $importer->setUploadCallback(
$this->uploadCallback = $importer->setUploadCallback(
-
array( &$this, 'handleUpload' )
);
+
[ $this, 'handleUpload' ]
);
$this->logItemCallback = $importer->setLogItemCallback(
$this->logItemCallback = $importer->setLogItemCallback(
-
array( &$this, 'handleLogItem' )
);
+
[ $this, 'handleLogItem' ]
);
if ( $this->uploads ) {
$importer->setImportUploads( true );
}
if ( $this->uploads ) {
$importer->setImportUploads( true );
}