From 94c35da77117f2a8f3b1ecf8523adbbe3247c1d3 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 22 Nov 2013 16:49:32 -0800 Subject: [PATCH] Clean up MimeMagic singleton handling bug: 56915 Change-Id: Ic8ed63816281be21cbcbe7d925a063d0d984c99e --- includes/MimeMagic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.20.1