Merge "DumpUploads: output local path instead of mwstore path"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 17 Jun 2016 02:12:27 +0000 (02:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 17 Jun 2016 02:12:27 +0000 (02:12 +0000)
1  2 
maintenance/dumpUploads.php

@@@ -99,7 -99,7 +99,7 @@@ By default, outputs relative paths agai
        function fetchLocal( $shared ) {
                $dbr = $this->getDB( DB_SLAVE );
                $result = $dbr->select( 'image',
 -                      array( 'img_name' ),
 +                      [ 'img_name' ],
                        '',
                        __METHOD__ );
  
        function outputItem( $name, $shared ) {
                $file = wfFindFile( $name );
                if ( $file && $this->filterItem( $file, $shared ) ) {
-                       $filename = $file->getPath();
+                       $filename = $file->getLocalRefPath();
                        $rel = wfRelativePath( $filename, $this->mBasePath );
                        $this->output( "$rel\n" );
                } else {