jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339336 )
Change subject: Return mime type in imageinfo response
......................................................................
Return mime type in imageinfo response
* And, adds a thumberror if transform returns false.
* Matches Parsoid commit e23a8185
Change-Id: I3c651bea67b2ea29fb49edc471040bfa041473a8
---
M includes/ApiParsoidBatch.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiParsoidBatch.php b/includes/ApiParsoidBatch.php
index 7fb456f..a8460aa 100644
--- a/includes/ApiParsoidBatch.php
+++ b/includes/ApiParsoidBatch.php
@@ -276,6 +276,7 @@
'width' => $file->getWidth(),
'height' => $file->getHeight(),
'mediatype' => $file->getMediaType(),
+ 'mime' => $file->getMimeType(),
'url' => wfExpandUrl( $file->getFullUrl(),
PROTO_CURRENT ),
'mustRender' => $file->mustRender(),
'badFile' => wfIsBadImage( $filename, $page ?: false ),
@@ -308,6 +309,8 @@
$result['thumbwidth'] = $mto->getWidth();
$result['thumbheight'] = $mto->getHeight();
}
+ } else {
+ $result['thumberror'] = "Presumably, invalid
parameters, despite validation.";
}
return $result;
}
--
To view, visit https://gerrit.wikimedia.org/r/339336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c651bea67b2ea29fb49edc471040bfa041473a8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: C. Scott Ananian <canan...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
