X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FMimeMagic.php;h=f5c28ab006aede38589ccc81f037edd9992a16e9;hb=0b741116c4a4ece3dfe016c6d7ce8126ef5c72c7;hp=44fafcaf15a1dd874b318c7be3997123b1b18a1b;hpb=760b1e8c3baa03f27900d227faba53842524023f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 44fafcaf15..f5c28ab006 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -167,11 +167,7 @@ class MimeMagic {
 
 	/** The singleton instance
 	 */
-	private static $instance;
-
-	/** True if the fileinfo extension has been loaded
-	 */
-	private static $extensionLoaded = false;
+	private static $instance = null;
 
 	/** Initializes the MimeMagic object. This is called by MimeMagic::singleton().
 	 *
@@ -182,7 +178,7 @@ class MimeMagic {
 		 *   --- load mime.types ---
 		 */
 
-		global $wgMimeTypeFile, $IP, $wgLoadFileinfoExtension;
+		global $wgMimeTypeFile, $IP;
 
 		$types = MM_WELL_KNOWN_MIME_TYPES;
 
@@ -190,11 +186,6 @@ class MimeMagic {
 			$wgMimeTypeFile = "$IP/$wgMimeTypeFile";
 		}
 
-		if ( $wgLoadFileinfoExtension && !self::$extensionLoaded ) {
-			self::$extensionLoaded = true;
-			wfDl( 'fileinfo' );
-		}
-
 		if ( $wgMimeTypeFile ) {
 			if ( is_file( $wgMimeTypeFile ) and is_readable( $wgMimeTypeFile ) ) {
 				wfDebug( __METHOD__ . ": loading mime types from $wgMimeTypeFile\n" );
@@ -345,7 +336,7 @@ class MimeMagic {
 	 * Get an instance of this class
 	 * @return MimeMagic
 	 */
-	public static function &singleton() {
+	public static function singleton() {
 		if ( self::$instance === null ) {
 			self::$instance = new MimeMagic;
 		}