Merge "Replace deprecated File::sha1Base36 call"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 23 Jun 2014 23:47:47 +0000 (23:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 23 Jun 2014 23:47:47 +0000 (23:47 +0000)
maintenance/importImages.php

index 3dd4a9e..ae70441 100644 (file)
@@ -177,7 +177,7 @@ if ( $count > 0 ) {
                        if ( isset( $options['skip-dupes'] ) ) {
                                $repo = $image->getRepo();
                                # XXX: we end up calculating this again when actually uploading. that sucks.
-                               $sha1 = File::sha1Base36( $file );
+                               $sha1 = FSFile::getSha1Base36FromPath( $file );
 
                                $dupes = $repo->findBySha1( $sha1 );