dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "MediaWikiTestCase: Fix schema restoration"
[lhc/web/wiklou.git]
/
includes
/
media
/
Exif.php
diff --git
a/includes/media/Exif.php
b/includes/media/Exif.php
index
e4de0a1
..
0fde386
100644
(file)
--- 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->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 );
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 ) {
$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":
$charset = "Shift-JIS";
break;
case "UNICODE\x00":
@@
-742,12
+741,16
@@
class Exif {
$ecount = 1; // checking individual elements
}
}
$ecount = 1; // checking individual elements
}
}
- $count = count( $val );
- if ( $ecount != $count ) {
- $this->debug( $val, __FUNCTION__, "Expected $ecount elements for $tag but got $count" );
- return false;
+ $count = 1;
+ if ( is_array( $val ) ) {
+ $count = count( $val );
+ if ( $ecount != $count ) {
+ $this->debug( $val, __FUNCTION__, "Expected $ecount elements for $tag but got $count" );
+ return false;
+ }
}
}
+ // If there are multiple values, recursively validate each of them.
if ( $count > 1 ) {
foreach ( $val as $v ) {
if ( !$this->validate( $section, $tag, $v, true ) ) {
if ( $count > 1 ) {
foreach ( $val as $v ) {
if ( !$this->validate( $section, $tag, $v, true ) ) {