| Index: trunk/extensions/SocialProfile/SystemGifts/SpecialSystemGiftManagerLogo.php |
| — | — | @@ -670,7 +670,7 @@ |
| 671 | 671 | */ |
| 672 | 672 | function verify( $tmpfile, $extension ) { |
| 673 | 673 | # magically determine mime type |
| 674 | | - $magic = & wfGetMimeMagic(); |
| | 674 | + $magic = MimeMagic::singleton(); |
| 675 | 675 | $mime = $magic->guessMimeType( $tmpfile, false ); |
| 676 | 676 | |
| 677 | 677 | # check mime type, if desired |
| — | — | @@ -714,7 +714,7 @@ |
| 715 | 715 | * @return bool |
| 716 | 716 | */ |
| 717 | 717 | function verifyExtension( $mime, $extension ) { |
| 718 | | - $magic =& wfGetMimeMagic(); |
| | 718 | + $magic = MimeMagic::singleton(); |
| 719 | 719 | |
| 720 | 720 | if ( !$mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) |
| 721 | 721 | if ( !$magic->isRecognizableExtension( $extension ) ) { |
| Index: trunk/extensions/SocialProfile/UserGifts/SpecialGiftManagerLogo.php |
| — | — | @@ -658,7 +658,7 @@ |
| 659 | 659 | */ |
| 660 | 660 | function verify( $tmpfile, $extension ) { |
| 661 | 661 | # magically determine mime type |
| 662 | | - $magic = & wfGetMimeMagic(); |
| | 662 | + $magic = MimeMagic::singleton(); |
| 663 | 663 | $mime = $magic->guessMimeType( $tmpfile, false ); |
| 664 | 664 | |
| 665 | 665 | # check mime type, if desired |
| — | — | @@ -703,7 +703,7 @@ |
| 704 | 704 | * @return bool |
| 705 | 705 | */ |
| 706 | 706 | function verifyExtension( $mime, $extension ) { |
| 707 | | - $magic = & wfGetMimeMagic(); |
| | 707 | + $magic = MimeMagic::singleton(); |
| 708 | 708 | |
| 709 | 709 | if ( !$mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) |
| 710 | 710 | if ( !$magic->isRecognizableExtension( $extension ) ) { |