X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2FRepoGroup.php;h=d47624f8cdea317368e03f13074770d3ea8ed209;hb=61898ad28ed69c5b391eb43e0db9386279b9612c;hp=d515b05088d5fb00953e874cfc95bad37a40c52a;hpb=2686727565a3eb1a9afff53b7c8b0d6b1106fb50;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php index d515b05088..d47624f8cd 100644 --- a/includes/filerepo/RepoGroup.php +++ b/includes/filerepo/RepoGroup.php @@ -135,17 +135,18 @@ class RepoGroup { } # Check the cache + $dbkey = $title->getDBkey(); if ( empty( $options['ignoreRedirect'] ) && empty( $options['private'] ) && empty( $options['bypassCache'] ) ) { $time = isset( $options['time'] ) ? $options['time'] : ''; - $dbkey = $title->getDBkey(); if ( $this->cache->has( $dbkey, $time, 60 ) ) { return $this->cache->get( $dbkey, $time ); } $useCache = true; } else { + $time = false; $useCache = false; } @@ -451,7 +452,9 @@ class RepoGroup { return $repo->getFileProps( $fileName ); } else { - return FSFile::getPropsFromPath( $fileName ); + $mwProps = new MWFileProps( MimeMagic::singleton() ); + + return $mwProps->getPropsFromPath( $fileName, true ); } }