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
Fix undefined $ok in DatabaseUpdater::migrateComments
[lhc/web/wiklou.git]
/
includes
/
media
/
GIFMetadataExtractor.php
diff --git
a/includes/media/GIFMetadataExtractor.php
b/includes/media/GIFMetadataExtractor.php
index
b4c3d6e
..
a26539a
100644
(file)
--- a/
includes/media/GIFMetadataExtractor.php
+++ b/
includes/media/GIFMetadataExtractor.php
@@
-161,9
+161,9
@@
class GIFMetadataExtractor {
UtfNormal\Validator::quickIsNFCVerify( $dataCopy );
if ( $dataCopy !== $data ) {
UtfNormal\Validator::quickIsNFCVerify( $dataCopy );
if ( $dataCopy !== $data ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$data = iconv( 'windows-1252', 'UTF-8', $data );
$data = iconv( 'windows-1252', 'UTF-8', $data );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
}
$commentCount = count( $comment );
}
$commentCount = count( $comment );
@@
-254,8
+254,6
@@
class GIFMetadataExtractor {
'duration' => $duration,
'xmp' => $xmp,
'comment' => $comment,
'duration' => $duration,
'xmp' => $xmp,
'comment' => $comment,
- 'width' => $width,
- 'height' => $height,
];
}
];
}