jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393506 )
Change subject: Replace MimeMagic::singleton() call
......................................................................
Replace MimeMagic::singleton() call
Change-Id: Ib01a23b909cb3e19c6d5ea9a8cf03d06ff8dab99
---
M includes/AbuseFilter.hooks.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Huji: Looks good to me, but someone else must approve
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/AbuseFilter.hooks.php b/includes/AbuseFilter.hooks.php
index fd71955..a6cdcb4 100644
--- a/includes/AbuseFilter.hooks.php
+++ b/includes/AbuseFilter.hooks.php
@@ -710,7 +710,11 @@
$vars->setVar( 'file_size', $upload->getFileSize() );
$vars->setVar( 'file_mime', $props['mime'] );
- $vars->setVar( 'file_mediatype',
MimeMagic::singleton()->getMediaType( null, $props['mime'] ) );
+ $vars->setVar(
+ 'file_mediatype',
+
MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer()
+ ->getMediaType( null, $props['mime'] )
+ );
$vars->setVar( 'file_width', $props['width'] );
$vars->setVar( 'file_height', $props['height'] );
$vars->setVar( 'file_bits_per_channel', $props['bits'] );
--
To view, visit https://gerrit.wikimedia.org/r/393506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01a23b909cb3e19c6d5ea9a8cf03d06ff8dab99
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Huji <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
