From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 23 Nov 2013 00:49:32 +0000 (-0800)
Subject: Clean up MimeMagic singleton handling
X-Git-Tag: 1.31.0-rc.0~17885^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=94c35da77117f2a8f3b1ecf8523adbbe3247c1d3;p=lhc%2Fweb%2Fwiklou.git

Clean up MimeMagic singleton handling

bug: 56915
Change-Id: Ic8ed63816281be21cbcbe7d925a063d0d984c99e
---

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 8220e92fc4..f5c28ab006 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -167,7 +167,7 @@ class MimeMagic {
 
 	/** The singleton instance
 	 */
-	private static $instance;
+	private static $instance = null;
 
 	/** Initializes the MimeMagic object. This is called by MimeMagic::singleton().
 	 *
@@ -336,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;
 		}