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
Merge "Adding white background color to thumbimages (i.e. framed images)"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
RepoGroup.php
diff --git
a/includes/filerepo/RepoGroup.php
b/includes/filerepo/RepoGroup.php
index
bd32de0
..
2edd6d0
100644
(file)
--- a/
includes/filerepo/RepoGroup.php
+++ b/
includes/filerepo/RepoGroup.php
@@
-334,7
+334,7
@@
class RepoGroup {
/**
* Get the repo instance by its name
* @param string $name
/**
* Get the repo instance by its name
* @param string $name
- * @return bool
+ * @return
FileRepo|
bool
*/
function getRepoByName( $name ) {
if ( !$this->reposInitialised ) {
*/
function getRepoByName( $name ) {
if ( !$this->reposInitialised ) {
@@
-452,7
+452,9
@@
class RepoGroup {
return $repo->getFileProps( $fileName );
} else {
return $repo->getFileProps( $fileName );
} else {
- return FSFile::getPropsFromPath( $fileName );
+ $mwProps = new MWFileProps( MimeMagic::singleton() );
+
+ return $mwProps->getPropsFromPath( $fileName, true );
}
}
}
}