| Index: trunk/tools/upload-scripts/thumb-handler.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | if ( preg_match('!^(?:http://upload.wikimedia.org)?/([\w-]*)/([\w-]*)/thumb(/archive|)/\w/\w\w/([^/]*)/' . |
| 8 | 8 | '(page(\d*)-)*(\d*)px-([^/]*)$!', $uri, $matches ) ) |
| 9 | 9 | { |
| 10 | | - list( $all, $site, $lang, $filename, $arch, $pagefull, $pagenum, $size, $fn2 ) = $matches; |
| | 10 | + list( $all, $site, $lang, $arch, $filename, $pagefull, $pagenum, $size, $fn2 ) = $matches; |
| 11 | 11 | $params = array( |
| 12 | 12 | 'f' => $filename, |
| 13 | 13 | 'width' => $size |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | } elseif ( preg_match('!^(?:http://upload.wikimedia.org)?/([\w-]*)/([\w-]*)/thumb(/archive|)/\w/\w\w/([^/]*\.(?:(?i)ogg))/' . |
| 22 | 22 | '(mid|seek(?:=|%3D|%3d)\d+)-([^/]*)$!', $uri, $matches ) ) |
| 23 | 23 | { |
| 24 | | - list( $all, $site, $lang, $filename, $arch, $timeFull, $fn2 ) = $matches; |
| | 24 | + list( $all, $site, $lang, $arch, $filename, $timeFull, $fn2 ) = $matches; |
| 25 | 25 | $params = array( 'f' => $filename ); |
| 26 | 26 | if ( $timeFull != 'mid' ) { |
| 27 | 27 | list( $seek, $thumbtime ) = explode( '=', urldecode( $timeFull ), 2 ); |
| — | — | @@ -196,7 +196,7 @@ |
| 197 | 197 | if( preg_match( '!^(?:http://upload.wikimedia.org)?/([\w-]*)/([\w-]*)/thumb(/archive|)/(\w)/(\w\w)/([^/]*)/([^/]*)$!', |
| 198 | 198 | $url, $matches ) ) { |
| 199 | 199 | $parts = array_map( 'rawurldecode', $matches ); |
| 200 | | - list( $all, $site, $lang, $hash1, $arch, $hash2, $filename, $fn2 ) = $parts; |
| | 200 | + list( $all, $site, $lang, $arch, $hash1, $hash2, $filename, $fn2 ) = $parts; |
| 201 | 201 | |
| 202 | 202 | $md5 = md5( $filename ); |
| 203 | 203 | if( $hash1 != substr( $md5, 0, 1 ) ) return false; |