Reverting r29798 on the committer's request, part 1 of 2

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 6be32db..fd42499 100644 (file)
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -84,19 +84,19 @@ class MimeMagic {
        * Mapping of media types to arrays of mime types.
        * This is used by findMediaType and getMediaType, respectively
        */
-       public static $mMediaTypes= NULL;
+       var $mMediaTypes= NULL;
 
        /** Map of mime type aliases
        */
-       public static $mMimeTypeAliases= NULL;
+       var $mMimeTypeAliases= NULL;
 
        /** map of mime types to file extensions (as a space seprarated list)
        */
-       public static $mMimeToExt= NULL;
+       var $mMimeToExt= NULL;
 
        /** map of file extensions types to mime types (as a space seprarated list)
        */
-       public static $mExtToMime= NULL;
+       var $mExtToMime= NULL;
 
        /** The singleton instance
         */

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 975d00e..0178b86 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -772,7 +772,7 @@ class SkinTemplate extends Skin {
 
                        wfProfileOut( "$fname-live" );
 
-                       if( $this->loggedin && 0) {
+                       if( $this->loggedin ) {
                                if( !$this->mTitle->userIsWatching()) {
                                        $content_actions['watch'] = array(
                                                'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,