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 "ApiQueryRevisions: Remove bogus query optimization"
[lhc/web/wiklou.git]
/
includes
/
MimeMagic.php
diff --git
a/includes/MimeMagic.php
b/includes/MimeMagic.php
index
ebe98a3
..
0d907b7
100644
(file)
--- a/
includes/MimeMagic.php
+++ b/
includes/MimeMagic.php
@@
-624,9
+624,9
@@
class MimeMagic {
*/
private function doGuessMimeType( $file, $ext ) { // TODO: remove $ext param
// Read a chunk of the file
*/
private function doGuessMimeType( $file, $ext ) { // TODO: remove $ext param
// 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';
@@
-780,9
+780,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'];