jenkins-bot has submitted this change and it was merged.
Change subject: Don't break $wgFileExtensions structure when removing 'mp4'
......................................................................
Don't break $wgFileExtensions structure when removing 'mp4'
Bug: 55366
Change-Id: I961070c1330f2492adac67d0dbb4066ad88b9819
---
M TimedMediaHandler.hooks.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 0a41b97..47a7f6e 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -18,10 +18,9 @@
// Remove mp4 if not enabled:
if( $wgTmhEnableMp4Uploads === false ){
- foreach( $wgFileExtensions as $inx => $val ) {
- if( $val == 'mp4' ){
- unset( $wgFileExtensions[$inx] );
- }
+ $index = array_search( 'mp4', $wgFileExtensions );
+ if ( $index !== false ) {
+ array_splice( $wgFileExtensions, $index, 1 );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/87715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I961070c1330f2492adac67d0dbb4066ad88b9819
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: J <[email protected]>
Gerrit-Reviewer: Kelson <[email protected]>
Gerrit-Reviewer: Mdale <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits