| Index: trunk/phase3/thumb.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' ); |
| 75 | 75 | return; |
| 76 | 76 | } |
| 77 | | - $sourcePath = $isOld ? $img->getArchivePath() : $img->getPath(); |
| | 77 | + $sourcePath = $img->getPath(); |
| 78 | 78 | if ( $sourcePath === false ) { |
| 79 | 79 | wfThumbError( 500, 'The source file is not locally accessible.' ); |
| 80 | 80 | return; |
| — | — | @@ -124,7 +124,7 @@ |
| 125 | 125 | $errorMsg = $thumb->getHtmlMsg(); |
| 126 | 126 | } elseif ( !$thumb->getPath() ) { |
| 127 | 127 | $errorMsg = wfMsgHtml( 'thumbnail_error', 'No path supplied in thumbnail object' ); |
| 128 | | - } elseif ( $thumb->getPath() == $sourcePath ) { |
| | 128 | + } elseif ( $thumb->getPath() == $img->getPath() ) { |
| 129 | 129 | $errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' . |
| 130 | 130 | 'is the requested width bigger than the source?' ); |
| 131 | 131 | } else { |