X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FExif.php;h=0fde38636b7ee10b759c40624fd5fdc4989f3ede;hb=c8f36c3754b675f9a730d4c0f6a6f9013a2967d2;hp=9977f45abdfde050dc29097473342e487c5f8f2c;hpb=89c7f8387575ac7595fdb0b0b25b07a547648c2f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/Exif.php b/includes/media/Exif.php index 9977f45abd..0fde38636b 100644 --- a/includes/media/Exif.php +++ b/includes/media/Exif.php @@ -290,7 +290,7 @@ class Exif { $this->byteOrder = 'BE'; // BE seems about twice as popular as LE in jpg's. } - $this->debugFile( $this->basename, __FUNCTION__, true ); + $this->debugFile( __FUNCTION__, true ); if ( function_exists( 'exif_read_data' ) ) { Wikimedia\suppressWarnings(); $data = exif_read_data( $this->file, 0, true ); @@ -455,8 +455,7 @@ class Exif { $val = substr( $this->mFilteredExifData[$prop], 8 ); switch ( $charCode ) { - case "\x4A\x49\x53\x00\x00\x00\x00\x00": - // JIS + case "JIS\x00\x00\x00\x00\x00": $charset = "Shift-JIS"; break; case "UNICODE\x00":