Aaron Schulz has submitted this change and it was merged.

Change subject: only filter out files not directory
......................................................................


only filter out files not directory

filterThumbnailPurgeList gets directory as first entry in list of files.
only filter the list of files and ignore directory.

Change-Id: I36a4c65c3508f36ff1079d2fc8b1059eff33e809
---
M TimedMediaHandler_body.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index e3d94bb..f532454 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -398,7 +398,7 @@
                $transcodeSet = array_merge($wgEnabledTranscodeSet, 
$wgEnabledAudioTranscodeSet);
 
                //dont remove derivatives on normal purge
-               foreach($files as $key => $file) {
+               foreach(array_slice($files, 1) as $key => $file) {
                        foreach( $transcodeSet as $transcodeKey ) {
                                if ( preg_match('/' . preg_quote($transcodeKey) 
. '$/', $file) ) {
                                        unset($files[$key]);

-- 
To view, visit https://gerrit.wikimedia.org/r/57040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36a4c65c3508f36ff1079d2fc8b1059eff33e809
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to