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 "rdbms: implement strictor ownership of LoadBalancer by LBFactory"
[lhc/web/wiklou.git]
/
maintenance
/
importImages.php
diff --git
a/maintenance/importImages.php
b/maintenance/importImages.php
index
1728695
..
381926a
100644
(file)
--- a/
maintenance/importImages.php
+++ b/
maintenance/importImages.php
@@
-32,6
+32,8
@@
* @author Mij <mij@bitchx.it>
*/
* @author Mij <mij@bitchx.it>
*/
+use MediaWiki\MediaWikiServices;
+
require_once __DIR__ . '/Maintenance.php';
class ImportImages extends Maintenance {
require_once __DIR__ . '/Maintenance.php';
class ImportImages extends Maintenance {
@@
-211,14
+213,16
@@
class ImportImages extends Maintenance {
if ( $checkUserBlock && ( ( $processed % $checkUserBlock ) == 0 ) ) {
$user->clearInstanceCache( 'name' ); // reload from DB!
if ( $checkUserBlock && ( ( $processed % $checkUserBlock ) == 0 ) ) {
$user->clearInstanceCache( 'name' ); // reload from DB!
- if ( $user->isBlocked() ) {
+ // @TODO Use PermissionManager::isBlockedFrom() instead.
+ if ( $user->getBlock() ) {
$this->output( $user->getName() . " was blocked! Aborting.\n" );
break;
}
}
# Check existence
$this->output( $user->getName() . " was blocked! Aborting.\n" );
break;
}
}
# Check existence
- $image = wfLocalFile( $title );
+ $image = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
+ ->newFile( $title );
if ( $image->exists() ) {
if ( $this->hasOption( 'overwrite' ) ) {
$this->output( "{$base} exists, overwriting..." );
if ( $image->exists() ) {
if ( $this->hasOption( 'overwrite' ) ) {
$this->output( "{$base} exists, overwriting..." );
@@
-305,7
+309,7
@@
class ImportImages extends Maintenance {
$publishOptions = [];
$handler = MediaHandler::getHandler( $props['mime'] );
if ( $handler ) {
$publishOptions = [];
$handler = MediaHandler::getHandler( $props['mime'] );
if ( $handler ) {
- $metadata =
Wikimedia\
quietCall( 'unserialize', $props['metadata'] );
+ $metadata =
\Wikimedia\AtEase\AtEase::
quietCall( 'unserialize', $props['metadata'] );
$publishOptions['headers'] = $handler->getContentHeaders( $metadata );
} else {
$publishOptions['headers'] = $handler->getContentHeaders( $metadata );
} else {