jenkins-bot has submitted this change and it was merged.
Change subject: media: Misc code clean up in DjVu.php
......................................................................
media: Misc code clean up in DjVu.php
* Use $cache->makeKey() instead of global.
* Access constants via $cache.
* Remove obsolete 'that = this' PHP 5.3 workaround.
Change-Id: I75505d3e3017fde185e43815d4e7acaba3fee69c
---
M includes/media/DjVu.php
1 file changed, 9 insertions(+), 10 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index cd249a8..9add138 100644
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -393,25 +393,24 @@
}
protected function getDimensionInfo( File $file ) {
- $that = $this;
-
- return ObjectCache::getMainWANInstance()->getWithSetCallback(
- wfMemcKey( 'file-djvu', 'dimensions', $file->getSha1()
),
- WANObjectCache::TTL_INDEFINITE,
- function () use ( $that, $file ) {
- $tree = $that->getMetaTree( $file );
+ $cache = ObjectCache::getMainWANInstance();
+ return $cache->getWithSetCallback(
+ $cache->makeKey( 'file-djvu', 'dimensions',
$file->getSha1() ),
+ $cache::TTL_INDEFINITE,
+ function () use ( $file ) {
+ $tree = $this->getMetaTree( $file );
if ( !$tree ) {
return false;
}
$dimsByPage = [];
$count = count( $tree->xpath( '//OBJECT' ) );
- for ( $i = 0; $i < $count; ++$i ) {
+ for ( $i = 0; $i < $count; $i++ ) {
$o = $tree->BODY[0]->OBJECT[$i];
if ( $o ) {
$dimsByPage[$i] = [
'width' =>
(int)$o['width'],
- 'height' =>
(int)$o['height']
+ 'height' =>
(int)$o['height'],
];
} else {
$dimsByPage[$i] = false;
@@ -420,7 +419,7 @@
return [ 'pageCount' => $count,
'dimensionsByPage' => $dimsByPage ];
},
- [ 'pcTTL' => WANObjectCache::TTL_INDEFINITE ]
+ [ 'pcTTL' => $cache::TTL_INDEFINITE ]
);
}
--
To view, visit https://gerrit.wikimedia.org/r/279560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75505d3e3017fde185e43815d4e7acaba3fee69c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
