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 "Improve wording of imageinfo API userid prop"
[lhc/web/wiklou.git]
/
includes
/
media
/
PNGMetadataExtractor.php
diff --git
a/includes/media/PNGMetadataExtractor.php
b/includes/media/PNGMetadataExtractor.php
index
bccd36c
..
ac92460
100644
(file)
--- a/
includes/media/PNGMetadataExtractor.php
+++ b/
includes/media/PNGMetadataExtractor.php
@@
-201,9
+201,9
@@
class PNGMetadataExtractor {
// if compressed
if ( $items[2] == "\x01" ) {
if ( function_exists( 'gzuncompress' ) && $items[4] === "\x00" ) {
// if compressed
if ( $items[2] == "\x01" ) {
if ( function_exists( 'gzuncompress' ) && $items[4] === "\x00" ) {
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$items[5] = gzuncompress( $items[5] );
$items[5] = gzuncompress( $items[5] );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $items[5] === false ) {
// decompression failed
if ( $items[5] === false ) {
// decompression failed
@@
-245,9
+245,9
@@
class PNGMetadataExtractor {
fseek( $fh, self::$crcSize, SEEK_CUR );
continue;
}
fseek( $fh, self::$crcSize, SEEK_CUR );
continue;
}
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );
@@
-285,9
+285,9
@@
class PNGMetadataExtractor {
continue;
}
continue;
}
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$content = gzuncompress( $content );
$content = gzuncompress( $content );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $content === false ) {
// decompression failed
if ( $content === false ) {
// decompression failed
@@
-296,9
+296,9
@@
class PNGMetadataExtractor {
continue;
}
continue;
}
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );