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 "Remove references to Popularpages alias"
[lhc/web/wiklou.git]
/
includes
/
MimeMagic.php
diff --git
a/includes/MimeMagic.php
b/includes/MimeMagic.php
index
3406831
..
2b240c3
100644
(file)
--- a/
includes/MimeMagic.php
+++ b/
includes/MimeMagic.php
@@
-200,7
+200,7
@@
class MimeMagic {
global $IP;
# Allow media handling extensions adding MIME-types and MIME-info
global $IP;
# Allow media handling extensions adding MIME-types and MIME-info
-
wfRunHooks
( 'MimeMagicInit', array( $this ) );
+
Hooks::run
( 'MimeMagicInit', array( $this ) );
$types = MM_WELL_KNOWN_MIME_TYPES;
$types = MM_WELL_KNOWN_MIME_TYPES;
@@
-218,7
+218,7
@@
class MimeMagic {
wfDebug( __METHOD__ . ": can't load mime types from $mimeTypeFile\n" );
}
} else {
wfDebug( __METHOD__ . ": can't load mime types from $mimeTypeFile\n" );
}
} else {
- wfDebug( __METHOD__ . ": no mime types file defined, using buil
d
-ins only.\n" );
+ wfDebug( __METHOD__ . ": no mime types file defined, using buil
t
-ins only.\n" );
}
$types .= "\n" . $this->mExtraTypes;
}
$types .= "\n" . $this->mExtraTypes;
@@
-295,7
+295,7
@@
class MimeMagic {
wfDebug( __METHOD__ . ": can't load mime info from $mimeInfoFile\n" );
}
} else {
wfDebug( __METHOD__ . ": can't load mime info from $mimeInfoFile\n" );
}
} else {
- wfDebug( __METHOD__ . ": no mime info file defined, using buil
d
-ins only.\n" );
+ wfDebug( __METHOD__ . ": no mime info file defined, using buil
t
-ins only.\n" );
}
$info .= "\n" . $this->mExtraInfo;
}
$info .= "\n" . $this->mExtraInfo;
@@
-569,7
+569,7
@@
class MimeMagic {
}
# Media handling extensions can improve the MIME detected
}
# Media handling extensions can improve the MIME detected
-
wfRunHooks
( 'MimeMagicImproveFromExtension', array( $this, $ext, &$mime ) );
+
Hooks::run
( 'MimeMagicImproveFromExtension', array( $this, $ext, &$mime ) );
if ( isset( $this->mMimeTypeAliases[$mime] ) ) {
$mime = $this->mMimeTypeAliases[$mime];
if ( isset( $this->mMimeTypeAliases[$mime] ) ) {
$mime = $this->mMimeTypeAliases[$mime];
@@
-617,16
+617,18
@@
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
// Read a chunk of the file
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$f = fopen( $file, 'rb' );
$f = fopen( $file, 'rb' );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( !$f ) {
return 'unknown/unknown';
if ( !$f ) {
return 'unknown/unknown';
@@
-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";
}
@@
-780,9
+782,9
@@
class MimeMagic {
return $this->detectZipType( $head, $tail, $ext );
}
return $this->detectZipType( $head, $tail, $ext );
}
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$gis = getimagesize( $file );
$gis = getimagesize( $file );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
if ( $gis && isset( $gis['mime'] ) ) {
$mime = $gis['mime'];
if ( $gis && isset( $gis['mime'] ) ) {
$mime = $gis['mime'];
@@
-802,7
+804,7
@@
class MimeMagic {
# people will hopefully nag and submit patches :)
$mime = false;
# Some strings by reference for performance - assuming well-behaved hooks
# people will hopefully nag and submit patches :)
$mime = false;
# Some strings by reference for performance - assuming well-behaved hooks
-
wfRunHooks
(
+
Hooks::run
(
'MimeMagicGuessFromContent',
array( $this, &$head, &$tail, $file, &$mime )
);
'MimeMagicGuessFromContent',
array( $this, &$head, &$tail, $file, &$mime )
);