Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97164
Change subject: Clean up MimeMagic singleton handling
......................................................................
Clean up MimeMagic singleton handling
bug: 56915
Change-Id: Ic8ed63816281be21cbcbe7d925a063d0d984c99e
---
M includes/MimeMagic.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/97164/1
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 8220e92..f5c28ab 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -167,7 +167,7 @@
/** The singleton instance
*/
- private static $instance;
+ private static $instance = null;
/** Initializes the MimeMagic object. This is called by
MimeMagic::singleton().
*
@@ -336,7 +336,7 @@
* Get an instance of this class
* @return MimeMagic
*/
- public static function &singleton() {
+ public static function singleton() {
if ( self::$instance === null ) {
self::$instance = new MimeMagic;
}
--
To view, visit https://gerrit.wikimedia.org/r/97164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8ed63816281be21cbcbe7d925a063d0d984c99e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
