| Index: trunk/phase3/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php |
| — | — | @@ -9,7 +9,11 @@ |
| 10 | 10 | * translation (to en) where XMP should win. |
| 11 | 11 | */ |
| 12 | 12 | public function testMultilingualCascade() { |
| 13 | | - |
| | 13 | + global $wgShowEXIF; |
| | 14 | + if ( !$wgShowEXIF ) { |
| | 15 | + $this->markTestIncomplete( "This test needs the exif extension." ); |
| | 16 | + } |
| | 17 | + |
| 14 | 18 | $meta = BitmapMetadataHandler::Jpeg( dirname( __FILE__ ) . |
| 15 | 19 | '/Xmp-exif-multilingual_test.jpg' ); |
| 16 | 20 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -354,7 +354,7 @@ |
| 355 | 355 | * Requires PHP's EXIF extension: http://www.php.net/manual/en/ref.exif.php |
| 356 | 356 | * |
| 357 | 357 | * NOTE FOR WINDOWS USERS: |
| 358 | | - * To enable EXIF functions, add the folloing lines to the |
| | 358 | + * To enable EXIF functions, add the following lines to the |
| 359 | 359 | * "Windows extensions" section of php.ini: |
| 360 | 360 | * |
| 361 | 361 | * extension=extensions/php_mbstring.dll |