Merge "mw.Map: add ability to map over an existing object other than 'window'"

[lhc/web/wiklou.git] / maintenance / cleanupUploadStash.php

diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php
index ba7c3cf..bc43c67 100644 (file)
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -120,7 +120,9 @@ class UploadStashCleanup extends Maintenance {
                $i = 0;
                foreach ( $iterator as $file ) {
                        // Absolute sanity check for stashed files and file segments
-                       if ( !preg_match( '#(^\d{14}!|\.\d+\.\w+\.\d+$)#', basename( $file ) ) ) {
+                       $base = basename( $file );
+                       // @TODO: why are there thumbnails stored in here?
+                       if ( !preg_match( '#(^\d{14}!|\.\d+\.\w+\.\d+$|-\w{12}\.\w{6}\.\d+\.)#', $base ) ) {
                                $this->output( "Skipped non-stash $file\n" );
                                continue;
                        }