dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f90977b
)
Merge "Clean up MimeMagic singleton handling"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Nov 2013 20:15:12 +0000
(20:15 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Tue, 26 Nov 2013 20:15:12 +0000
(20:15 +0000)
includes/MimeMagic.php
patch
|
blob
|
history
diff --git
a/includes/MimeMagic.php
b/includes/MimeMagic.php
index
8220e92
..
f5c28ab
100644
(file)
--- 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;
}