| Index: trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php |
| — | — | @@ -88,6 +88,7 @@ |
| 89 | 89 | public function retrieveMetaData() { |
| 90 | 90 | global $wgImageMagickIdentifyCommand, $wgTiffExivCommand, $wgTiffUseExiv; |
| 91 | 91 | global $wgTiffUseTiffinfo, $wgTiffTiffinfoCommand; |
| | 92 | + global $wgShowEXIF; |
| 92 | 93 | |
| 93 | 94 | if ( $this->_meta === null ) { |
| 94 | 95 | wfProfileIn( 'PagedTiffImage::retrieveMetaData' ); |
| — | — | @@ -164,7 +165,7 @@ |
| 165 | 166 | $data = $this->parseExiv2Output( $dump ); |
| 166 | 167 | |
| 167 | 168 | $this->_meta['exif'] = $data; |
| 168 | | - } else { |
| | 169 | + } else if ( $wgShowEXIF ) { |
| 169 | 170 | wfDebug( __METHOD__ . ": using internal Exif( {$this->mFilename} )\n" ); |
| 170 | 171 | $exif = new Exif( $this->mFilename ); |
| 171 | 172 | $data = $exif->getFilteredData(); |