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
Add $wgCdnReboundPurgeDelay for more consistent CDN purges
[lhc/web/wiklou.git]
/
includes
/
MimeMagic.php
diff --git
a/includes/MimeMagic.php
b/includes/MimeMagic.php
index
0d907b7
..
8ab92b4
100644
(file)
--- a/
includes/MimeMagic.php
+++ b/
includes/MimeMagic.php
@@
-323,7
+323,7
@@
class MimeMagic {
continue;
}
continue;
}
- #print "processing MIME INFO line $s<br>";
+ #
print "processing MIME INFO line $s<br>";
$match = array();
if ( preg_match( '!\[\s*(\w+)\s*\]!', $s, $match ) ) {
$match = array();
if ( preg_match( '!\[\s*(\w+)\s*\]!', $s, $match ) ) {
@@
-617,12
+617,14
@@
class MimeMagic {
/**
* Guess the MIME type from the file contents.
*
/**
* Guess the MIME type from the file contents.
*
+ * @todo Remove $ext param
+ *
* @param string $file
* @param mixed $ext
* @return bool|string
* @throws MWException
*/
* @param string $file
* @param mixed $ext
* @return bool|string
* @throws MWException
*/
- private function doGuessMimeType( $file, $ext ) {
// TODO: remove $ext param
+ private function doGuessMimeType( $file, $ext ) {
// Read a chunk of the file
MediaWiki\suppressWarnings();
$f = fopen( $file, 'rb' );
// Read a chunk of the file
MediaWiki\suppressWarnings();
$f = fopen( $file, 'rb' );
@@
-693,7
+695,7
@@
class MimeMagic {
}
/* Look for WebP */
}
/* Look for WebP */
- if ( strncmp( $head, "RIFF", 4 ) == 0 && strncmp( substr( $head, 8,
8 ), "WEBPVP8 ", 8
) == 0 ) {
+ if ( strncmp( $head, "RIFF", 4 ) == 0 && strncmp( substr( $head, 8,
7 ), "WEBPVP8", 7
) == 0 ) {
wfDebug( __METHOD__ . ": recognized file as image/webp\n" );
return "image/webp";
}
wfDebug( __METHOD__ . ": recognized file as image/webp\n" );
return "image/webp";
}
@@
-955,7
+957,7
@@
class MimeMagic {
if ( $m ) {
# normalize
if ( $m ) {
# normalize
- $m = preg_replace( '![;, ].*$!', '', $m ); #strip charset, etc
+ $m = preg_replace( '![;, ].*$!', '', $m ); #
strip charset, etc
$m = trim( $m );
$m = strtolower( $m );
$m = trim( $m );
$m = strtolower( $m );