| Index: trunk/phase3/includes/Image.php |
| — | — | @@ -188,7 +188,8 @@ |
| 189 | 189 | * Load metadata from the file itself |
| 190 | 190 | */ |
| 191 | 191 | function loadFromFile() { |
| 192 | | - global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang; |
| | 192 | + global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang, |
| | 193 | + $wgShowEXIF; |
| 193 | 194 | $fname = 'Image::loadFromFile'; |
| 194 | 195 | wfProfileIn( $fname ); |
| 195 | 196 | $this->imagePath = $this->getFullPath(); |
| — | — | @@ -267,7 +268,7 @@ |
| 268 | 269 | $this->dataLoaded = true; |
| 269 | 270 | |
| 270 | 271 | |
| 271 | | - if ($this->fileExists) $this->metadata = serialize ( $this->retrieveExifData() ) ; |
| | 272 | + if ($this->fileExists && $wgShowEXIF) $this->metadata = serialize ( $this->retrieveExifData() ) ; |
| 272 | 273 | else $this->metadata = serialize ( array() ) ; |
| 273 | 274 | |
| 274 | 275 | if ( isset( $gis['bits'] ) ) $this->bits = $gis['bits']; |