* @return string
*/
function getArchiveThumbRel( $archiveName, $suffix = false ) {
- $path = 'archive/' . $this->getHashPath() . $archiveName . "/";
+ $path = $this->getArchiveRel( $archiveName ) . "/";
if ( $suffix === false ) {
$path = substr( $path, 0, -1 );
} else {
$this->lock(); // begin
$archiveName = wfTimestamp( TS_MW ) . '!' . $this->getName();
- $archiveRel = 'archive/' . $this->getHashPath() . $archiveName;
+ $archiveRel = $this->getArchiveRel( $archiveName );
if ( $repo->hasSha1Storage() ) {
$sha1 = $repo->isVirtualUrl( $srcPath )
* @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() {
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() ) {