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
Converted ApiQueryPageProps to use PageProps; added multi-property query to PageProps.
[lhc/web/wiklou.git]
/
includes
/
MimeMagic.php
diff --git
a/includes/MimeMagic.php
b/includes/MimeMagic.php
index
3b06525
..
d619f2d
100644
(file)
--- a/
includes/MimeMagic.php
+++ b/
includes/MimeMagic.php
@@
-59,7
+59,7
@@
application/vnd.oasis.opendocument.text odt
application/vnd.oasis.opendocument.text-master otm
application/vnd.oasis.opendocument.text-template ott
application/vnd.oasis.opendocument.text-web oth
application/vnd.oasis.opendocument.text-master otm
application/vnd.oasis.opendocument.text-template ott
application/vnd.oasis.opendocument.text-web oth
-application/
x-
javascript js
+application/javascript js
application/x-shockwave-flash swf
audio/midi mid midi kar
audio/mpeg mpga mpa mp2 mp3
application/x-shockwave-flash swf
audio/midi mid midi kar
audio/mpeg mpga mpa mp2 mp3
@@
-110,7
+110,7
@@
application/vnd.oasis.opendocument.text [OFFICE]
application/vnd.oasis.opendocument.text-template [OFFICE]
application/vnd.oasis.opendocument.text-master [OFFICE]
application/vnd.oasis.opendocument.text-web [OFFICE]
application/vnd.oasis.opendocument.text-template [OFFICE]
application/vnd.oasis.opendocument.text-master [OFFICE]
application/vnd.oasis.opendocument.text-web [OFFICE]
-text/javascript application/x-javascript [EXECUTABLE]
+
application/javascript
text/javascript application/x-javascript [EXECUTABLE]
application/x-shockwave-flash [MULTIMEDIA]
audio/midi [AUDIO]
audio/x-aiff [AUDIO]
application/x-shockwave-flash [MULTIMEDIA]
audio/midi [AUDIO]
audio/x-aiff [AUDIO]
@@
-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 ) ) {
@@
-695,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";
}
@@
-957,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 );