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 "Use file width/height instead of metadata for getContentHeaders"
[lhc/web/wiklou.git]
/
includes
/
media
/
FormatMetadata.php
diff --git
a/includes/media/FormatMetadata.php
b/includes/media/FormatMetadata.php
index
51a0135
..
69982c2
100644
(file)
--- a/
includes/media/FormatMetadata.php
+++ b/
includes/media/FormatMetadata.php
@@
-24,6
+24,8
@@
* @see http://exif.org/Exif2-2.PDF The Exif 2.2 specification
* @file
*/
* @see http://exif.org/Exif2-2.PDF The Exif 2.2 specification
* @file
*/
+use MediaWiki\MediaWikiServices;
+use Wikimedia\Timestamp\TimestampException;
/**
* Format Image metadata values into a human readable form.
/**
* Format Image metadata values into a human readable form.
@@
-1580,14
+1582,14
@@
class FormatMetadata extends ContextSource {
* @since 1.23
*/
public function fetchExtendedMetadata( File $file ) {
* @since 1.23
*/
public function fetchExtendedMetadata( File $file ) {
- $cache =
ObjectCache::getMainWANInstanc
e();
+ $cache =
MediaWikiServices::getInstance()->getMainWANObjectCach
e();
// If revision deleted, exit immediately
if ( $file->isDeleted( File::DELETED_FILE ) ) {
return [];
}
// If revision deleted, exit immediately
if ( $file->isDeleted( File::DELETED_FILE ) ) {
return [];
}
- $cacheKey =
wfMemc
Key(
+ $cacheKey =
$cache->make
Key(
'getExtendedMetadata',
$this->getLanguage()->getCode(),
(int)$this->singleLang,
'getExtendedMetadata',
$this->getLanguage()->getCode(),
(int)$this->singleLang,