dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make use of \File::getArchiveRel to avoid code duplication
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
file
/
OldLocalFile.php
diff --git
a/includes/filerepo/file/OldLocalFile.php
b/includes/filerepo/file/OldLocalFile.php
index
f103afa
..
ad95bb4
100644
(file)
--- 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 string
*/
function getRel() {
- return
'archive/' . $this->getHashPath() . $this->getArchiveName(
);
+ return
$this->getArchiveRel( $this->getArchiveName()
);
}
/**
* @return string
*/
function getUrlRel() {
}
/**
* @return string
*/
function getUrlRel() {
- return
'archive/' . $this->getHashPath() . rawurlencode( $this->getArchiveName(
) );
+ return
$this->getArchiveRel( rawurlencode( $this->getArchiveName()
) );
}
function upgradeRow() {
}
function upgradeRow() {
@@
-416,7
+416,7
@@
class OldLocalFile extends LocalFile {
function uploadOld( $srcPath, $archiveName, $timestamp, $comment, $user ) {
$this->lock();
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() ) {
$status = $this->publishTo( $srcPath, $dstRel );
if ( $status->isGood() ) {