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 "Add SPARQL client to core"
[lhc/web/wiklou.git]
/
includes
/
media
/
JpegMetadataExtractor.php
diff --git
a/includes/media/JpegMetadataExtractor.php
b/includes/media/JpegMetadataExtractor.php
index
67c957a
..
229a891
100644
(file)
--- a/
includes/media/JpegMetadataExtractor.php
+++ b/
includes/media/JpegMetadataExtractor.php
@@
-94,7
+94,6
@@
class JpegMetadataExtractor {
$buffer = fread( $fh, 1 );
}
if ( $buffer === "\xFE" ) {
$buffer = fread( $fh, 1 );
}
if ( $buffer === "\xFE" ) {
-
// COM section -- file comment
// First see if valid utf-8,
// if not try to convert it to windows-1252.
// COM section -- file comment
// First see if valid utf-8,
// if not try to convert it to windows-1252.
@@
-103,9
+102,9
@@
class JpegMetadataExtractor {
// turns $com to valid utf-8.
// thus if no change, its utf-8, otherwise its something else.
if ( $com !== $oldCom ) {
// turns $com to valid utf-8.
// thus if no change, its utf-8, otherwise its something else.
if ( $com !== $oldCom ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$com = $oldCom = iconv( 'windows-1252', 'UTF-8//IGNORE', $oldCom );
$com = $oldCom = iconv( 'windows-1252', 'UTF-8//IGNORE', $oldCom );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
}
// Try it again, if its still not a valid string, then probably
// binary junk or some really weird encoding, so don't extract.
}
// Try it again, if its still not a valid string, then probably
// binary junk or some really weird encoding, so don't extract.