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

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;
 		}