Merge "jquery.makeCollapsible: Simplify code"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8f6b202..9112112 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2838,7 +2838,7 @@ class EditPage {
                                                '{{fullurl:Special:UserLogin/signup|returnto={{FULLPAGENAMEE}}}}' ]
                                );
                        } else {
-                               $wgOut->wrapWikiMsg( "<div id=\"mw-anon-preview-warning\">\n$1</div>",
+                               $wgOut->wrapWikiMsg( "<div id=\"mw-anon-preview-warning\" class=\"warningbox\">\n$1</div>",
                                        'anonpreviewwarning'
                                );
                        }

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index 5876e0b..21486ff 100644 (file)
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -150,7 +150,7 @@ class ParserCache {
                                        "Parser options key expired, touched " . $article->getTouched()
                                        . ", epoch $wgCacheEpoch, cached $cacheTime\n" );
                                return false;
-                       } elseif ( $optionsKey->isDifferentRevision( $article->getLatest() ) ) {
+                       } elseif ( !$useOutdated && $optionsKey->isDifferentRevision( $article->getLatest() ) ) {
                                wfIncrStats( "pcache.miss.revid" );
                                $revId = $article->getLatest();
                                $cachedRevId = $optionsKey->getCacheRevisionId();
@@ -230,7 +230,7 @@ class ParserCache {
                                "ParserOutput key expired, touched $touched, "
                                . "epoch $wgCacheEpoch, cached $cacheTime\n" );
                        $value = false;
-               } elseif ( $value->isDifferentRevision( $article->getLatest() ) ) {
+               } elseif ( !$useOutdated && $value->isDifferentRevision( $article->getLatest() ) ) {
                        wfIncrStats( "pcache.miss.revid" );
                        $revId = $article->getLatest();
                        $cachedRevId = $value->getCacheRevisionId();

diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index 4c618d4..cfdf797 100644 (file)
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -112,7 +112,6 @@ abbr[title],
 .mw-plusminus-neg,
 .mw-plusminus-null {
        unicode-bidi: -moz-isolate;
-       unicode-bidi: -webkit-isolate;
        unicode-bidi: isolate;
 }
 
@@ -120,7 +119,6 @@ abbr[title],
 span.comment {
        font-style: italic;
        unicode-bidi: -moz-isolate;
-       unicode-bidi: -webkit-isolate;
        unicode-bidi: isolate;
 }
 

diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less
index 66b3fb2..99d465b 100644 (file)
--- a/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@ -35,7 +35,6 @@ span.reference {
        line-height: 1;
        vertical-align: super;
        unicode-bidi: -moz-isolate;
-       unicode-bidi: -webkit-isolate;
        unicode-bidi: isolate;
 }