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 "jquery.textSelection.test: Fix regression in Opera"
[lhc/web/wiklou.git]
/
includes
/
media
/
ExifBitmap.php
diff --git
a/includes/media/ExifBitmap.php
b/includes/media/ExifBitmap.php
index
1a761f3
..
98c423f
100644
(file)
--- a/
includes/media/ExifBitmap.php
+++ b/
includes/media/ExifBitmap.php
@@
-51,11
+51,11
@@
class ExifBitmapHandler extends BitmapHandler {
// Treat Software as a special case because in can contain
// an array of (SoftwareName, Version).
// Treat Software as a special case because in can contain
// an array of (SoftwareName, Version).
- if (isset( $metadata['Software'] )
+ if (
isset( $metadata['Software'] )
&& is_array( $metadata['Software'] )
&& is_array( $metadata['Software'] )
- && is_array( $metadata['Software'][0])
+ && is_array( $metadata['Software'][0]
)
&& isset( $metadata['Software'][0][0] )
&& isset( $metadata['Software'][0][0] )
- && isset( $metadata['Software'][0][1])
+ && isset( $metadata['Software'][0][1]
)
) {
$metadata['Software'] = $metadata['Software'][0][0] . ' (Version '
. $metadata['Software'][0][1] . ')';
) {
$metadata['Software'] = $metadata['Software'][0][0] . ' (Version '
. $metadata['Software'][0][1] . ')';
@@
-190,7
+190,7
@@
class ExifBitmapHandler extends BitmapHandler {
}
$data = $file->getMetadata();
}
$data = $file->getMetadata();
- return
self::
getRotationForExif( $data );
+ return
$this->
getRotationForExif( $data );
}
/**
}
/**