From bb3deb3701df64219a266e2aecb8a40c1b0ec465 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 13 Sep 2010 03:10:28 +0000
Subject: [PATCH] Fixed some overly-long lines, mostly from r72023.

---
 includes/MimeMagic.php     | 12 ++++++++----
 includes/filerepo/File.php |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index da9d1ab71b..cde30bc009 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -430,7 +430,8 @@ class MimeMagic {
 	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 @@ class MimeMagic {
 				* 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 @@ class MimeMagic {
 	*/
 	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 @@ class MimeMagic {
 	 */
 	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';
diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 6b7dcf8a13..34de8b7421 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1197,8 +1197,10 @@ abstract class File {
 				$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'] );
-- 
2.20.1