From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 15 Jan 2008 16:04:50 +0000 (+0000)
Subject: Reverting r29798 on the committer's request, part 1 of 2
X-Git-Tag: 1.31.0-rc.0~49985
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=2e5d1b0c59b9c85e66edf23a6c1c0d029e4db0f8;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 6be32db174..fd42499bc8 100644
--- 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 975d00ead3..0178b86656 100644
--- 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,