Quick fix: revert cached sidebar

Breaks badly due to user language selection

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index c6c56ab..de8fd95 100755 (executable)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -289,11 +289,10 @@ class MessageCache {
        }
 
        function replace( $title, $text ) {
-               global $wgLocalMessageCache, $parserMemc, $wgDBname;
+               global $wgLocalMessageCache;
 
                $this->lock();
                $this->load();
-               $parserMemc->delete("$wgDBname:sidebar");
                if ( is_array( $this->mCache ) ) {
                        $this->mCache[$title] = $text;
                        $this->mMemc->set( $this->mMemcKey, $this->mCache, $this->mExpiry );

diff --git a/includes/Skin.php b/includes/Skin.php
index 0dd3077..532a7bf 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1393,16 +1393,11 @@ END;
         * @access private
         */
        function buildSidebar() {
-               global $wgTitle, $action, $wgDBname, $parserMemc;
+               global $wgTitle, $action;
 
                $fname = 'SkinTemplate::buildSidebar';
-
+               $pageurl = $wgTitle->getLocalURL();
                wfProfileIn( $fname );
-               $cachedsidebar=$parserMemc->get("{$wgDBname}:sidebar");
-               if ($cachedsidebar!="") {
-                       wfProfileOut($fname);
-                       return $cachedsidebar;
-               }
 
                $bar = array();
                $lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
@@ -1427,13 +1422,12 @@ END;
                                                'text' => $text,
                                                'href' => $href,
                                                'id' => 'n-' . strtr($line[1], ' ', '-'),
-                                               'active' => false
+                                               'active' => $pageurl == $href
                                        );
                                } else { continue; }
                        }
                }
 
-               $cachednotice=$parserMemc->set("{$wgDBname}:sidebar",$bar,86400);
                wfProfileOut( $fname );
                return $bar;
        }