From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 7 Jul 2009 06:04:58 +0000 (+0000)
Subject: Revert r52821 ("Watch and flaggedrevs AJAX success messages not appearing in Vector... 
X-Git-Tag: 1.31.0-rc.0~41072
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=528f8678c554adde9eac68046b1cdfaf37892cb9;p=lhc%2Fweb%2Fwiklou.git

Revert r52821 ("Watch and flaggedrevs AJAX success messages not appearing in Vector"), gonna be done completely differently
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 980994a54b..b11858e078 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -316,7 +316,6 @@ class SkinVector extends SkinTemplate {
 			// Gets preferred variant
 			$preferred = $wgContLang->getPreferredVariant();
 			// Loops over each variant
-			$vcount = 0;
 			foreach( $variants as $code ) {
 				// Gets variant name from language code
 				$varname = $wgContLang->getVariantname( $code );
@@ -326,12 +325,11 @@ class SkinVector extends SkinTemplate {
 					continue;
 				}
 				// Appends variant link
-				$links['variants'][$vcount] = array(
+				$links['variants'][] = array(
 					'class' => ( $code == $preferred ) ? 'selected' : false,
 					'text' => $varname,
 					'href' => $this->mTitle->getLocalURL( '', $code )
 				);
-				$vcount ++;
 			}
 		}
 
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index d77e24d137..b81196f33e 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -874,7 +874,9 @@ function jsMsg( message, className ) {
 	var messageDiv = document.getElementById( 'mw-js-message' );
 	if ( !messageDiv ) {
 		messageDiv = document.createElement( 'div' );
-		if ( skin == 'vector' || skin == 'monobook' )
+		if ( document.getElementById( 'column-content' )
+		&& document.getElementById( 'content' ) ) {
+			// MonoBook, presumably
 			document.getElementById( 'content' ).insertBefore(
 				messageDiv,
 				document.getElementById( 'content' ).firstChild