X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FLocalFile.php;h=33177d3f6fb9f3c742f3c254e3db2b18e2cd6534;hp=a4122503a7b5e1e6ac23eaf1cf08cdc21a6943f5;hb=89539f2aa1b158fdcc703ad053e2580cb97a6385;hpb=00cc6ec3ba3de2bfb2873651ddaf06d29addfd55 diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index a4122503a7..33177d3f6f 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -215,7 +215,6 @@ class LocalFile extends File { } /** - * Constructor. * Do not call this except from inside a repo class. * @param Title $title * @param FileRepo $repo @@ -1032,9 +1031,15 @@ class LocalFile extends File { $purgeList = []; foreach ( $files as $file ) { - # Check that the base file name is part of the thumb name + if ( $this->repo->supportsSha1URLs() ) { + $reference = $this->getSha1(); + } else { + $reference = $this->getName(); + } + + # Check that the reference (filename or sha1) is part of the thumb name # This is a basic sanity check to avoid erasing unrelated directories - if ( strpos( $file, $this->getName() ) !== false + if ( strpos( $file, $reference ) !== false || strpos( $file, "-thumbnail" ) !== false // "short" thumb name ) { $purgeList[] = "{$dir}/{$file}";