Revert r52821 ("Watch and flaggedrevs AJAX success messages not appearing in Vector...

diff --git a/skins/Vector.php b/skins/Vector.php
index 980994a..b11858e 100644 (file)
--- 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 d77e24d..b81196f 100644 (file)
--- 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