Deprecating: Consolidating `progressive` & `constructive` buttons

[lhc/web/wiklou.git] / maintenance / importImages.php

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index ad385e5..701af62 100644 (file)
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -70,9 +70,9 @@ $files = findFiles( $dir, $extensions, isset( $options['search-recursively'] ) )
 # Initialise the user for this operation
 $user = isset( $options['user'] )
        ? User::newFromName( $options['user'] )
-       : User::newFromName( 'Maintenance script' );
+       : User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
 if ( !$user instanceof User ) {
-       $user = User::newFromName( 'Maintenance script' );
+       $user = User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
 }
 $wgUser = $user;
 
@@ -136,7 +136,7 @@ $count = count( $files );
 if ( $count > 0 ) {
 
        foreach ( $files as $file ) {
-               $base = wfBaseName( $file );
+               $base = UtfNormal\Validator::cleanUp( wfBaseName( $file ) );
 
                # Validate a title
                $title = Title::makeTitleSafe( NS_FILE, $base );