http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72889
Revision: 72889
Author: tstarling
Date: 2010-09-13 03:10:28 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
Fixed some overly-long lines, mostly from r72023.
Modified Paths:
--------------
trunk/phase3/includes/MimeMagic.php
trunk/phase3/includes/filerepo/File.php
Modified: trunk/phase3/includes/MimeMagic.php
===================================================================
--- trunk/phase3/includes/MimeMagic.php 2010-09-13 00:00:11 UTC (rev 72888)
+++ trunk/phase3/includes/MimeMagic.php 2010-09-13 03:10:28 UTC (rev 72889)
@@ -430,7 +430,8 @@
function improveTypeFromExtension( $mime, $ext ) {
if ( $mime === "unknown/unknown" ) {
if( $this->isRecognizableExtension( $ext ) ) {
- wfDebug( __METHOD__. ": refusing to guess mime
type for .$ext file, we should have recognized it\n" );
+ wfDebug( __METHOD__. ": refusing to guess mime
type for .$ext file, " .
+ "we should have recognized it\n" );
} else {
/* Not something we can detect, so simply
* trust the file extension */
@@ -443,7 +444,8 @@
* find the proper mime type for that file
extension */
$mime = $this->guessTypesForExtension( $ext );
} else {
- wfDebug( __METHOD__. ": refusing to guess
better type for $mime file, .$ext is not a known OPC extension.\n" );
+ wfDebug( __METHOD__. ": refusing to guess
better type for $mime file, " .
+ ".$ext is not a known OPC extension.\n"
);
$mime = "application/zip";
}
}
@@ -470,7 +472,8 @@
*/
function guessMimeType( $file, $ext = true ) {
if( $ext ) { # TODO: make $ext default to false. Or better,
remove it.
- wfDebug( __METHOD__.": WARNING: use of the \$ext
parameter is deprecated. Use improveTypeFromExtension(\$mime, \$ext)
instead.\n" );
+ wfDebug( __METHOD__.": WARNING: use of the \$ext
parameter is deprecated. " .
+ "Use improveTypeFromExtension(\$mime, \$ext)
instead.\n" );
}
$mime = $this->doGuessMimeType( $file, $ext );
@@ -663,7 +666,8 @@
*/
function detectZipType( $header, $tail = null, $ext = false ) {
if( $ext ) { # TODO: remove $ext param
- wfDebug( __METHOD__.": WARNING: use of the \$ext
parameter is deprecated. Use improveTypeFromExtension(\$mime, \$ext)
instead.\n" );
+ wfDebug( __METHOD__.": WARNING: use of the \$ext
parameter is deprecated. " .
+ "Use improveTypeFromExtension(\$mime, \$ext)
instead.\n" );
}
$mime = 'application/zip';
Modified: trunk/phase3/includes/filerepo/File.php
===================================================================
--- trunk/phase3/includes/filerepo/File.php 2010-09-13 00:00:11 UTC (rev
72888)
+++ trunk/phase3/includes/filerepo/File.php 2010-09-13 03:10:28 UTC (rev
72889)
@@ -1197,8 +1197,10 @@
$ext = strtolower( $i ? substr( $path, $i + 1 )
: '' );
}
- $info['file-mime'] = $magic->guessMimeType( $path,
false ); # mime type according to file contents
- $info['mime'] = $magic->improveTypeFromExtension(
$info['file-mime'], $ext ); # logical mime type
+ # mime type according to file contents
+ $info['file-mime'] = $magic->guessMimeType( $path,
false );
+ # logical mime type
+ $info['mime'] = $magic->improveTypeFromExtension(
$info['file-mime'], $ext );
list( $info['major_mime'], $info['minor_mime'] ) =
self::splitMime( $info['mime'] );
$info['media_type'] = $magic->getMediaType( $path,
$info['mime'] );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
