| Index: trunk/phase3/includes/MimeMagic.php |
| — | — | @@ -84,19 +84,19 @@ |
| 85 | 85 | * Mapping of media types to arrays of mime types. |
| 86 | 86 | * This is used by findMediaType and getMediaType, respectively |
| 87 | 87 | */ |
| 88 | | - public static $mMediaTypes= NULL; |
| | 88 | + var $mMediaTypes= NULL; |
| 89 | 89 | |
| 90 | 90 | /** Map of mime type aliases |
| 91 | 91 | */ |
| 92 | | - public static $mMimeTypeAliases= NULL; |
| | 92 | + var $mMimeTypeAliases= NULL; |
| 93 | 93 | |
| 94 | 94 | /** map of mime types to file extensions (as a space seprarated list) |
| 95 | 95 | */ |
| 96 | | - public static $mMimeToExt= NULL; |
| | 96 | + var $mMimeToExt= NULL; |
| 97 | 97 | |
| 98 | 98 | /** map of file extensions types to mime types (as a space seprarated list) |
| 99 | 99 | */ |
| 100 | | - public static $mExtToMime= NULL; |
| | 100 | + var $mExtToMime= NULL; |
| 101 | 101 | |
| 102 | 102 | /** The singleton instance |
| 103 | 103 | */ |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -772,7 +772,7 @@ |
| 773 | 773 | |
| 774 | 774 | wfProfileOut( "$fname-live" ); |
| 775 | 775 | |
| 776 | | - if( $this->loggedin && 0) { |
| | 776 | + if( $this->loggedin ) { |
| 777 | 777 | if( !$this->mTitle->userIsWatching()) { |
| 778 | 778 | $content_actions['watch'] = array( |
| 779 | 779 | 'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false, |