X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FOldLocalFile.php;h=ad95bb42101bf08087d1d411afe576884ed7e386;hb=2181f406ead57c296f85257ac299cf20f17d857f;hp=f103afabc653f56be942ce240c1f72ef60216d15;hpb=6ac8c496d16c1f88d1b8b4cf449085301ddefdce;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php index f103afabc6..ad95bb4210 100644 --- a/includes/filerepo/file/OldLocalFile.php +++ b/includes/filerepo/file/OldLocalFile.php @@ -325,14 +325,14 @@ class OldLocalFile extends LocalFile { * @return string */ function getRel() { - return 'archive/' . $this->getHashPath() . $this->getArchiveName(); + return $this->getArchiveRel( $this->getArchiveName() ); } /** * @return string */ function getUrlRel() { - return 'archive/' . $this->getHashPath() . rawurlencode( $this->getArchiveName() ); + return $this->getArchiveRel( rawurlencode( $this->getArchiveName() ) ); } function upgradeRow() { @@ -416,7 +416,7 @@ class OldLocalFile extends LocalFile { function uploadOld( $srcPath, $archiveName, $timestamp, $comment, $user ) { $this->lock(); - $dstRel = 'archive/' . $this->getHashPath() . $archiveName; + $dstRel = $this->getArchiveRel( $archiveName ); $status = $this->publishTo( $srcPath, $dstRel ); if ( $status->isGood() ) {