(bug 987) revert broken attempt to fix bug 502, which broke MonoBook tabs in diff...

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 31eb28d..667cd78 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -525,8 +525,6 @@ class OutputPage {
                $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
                $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
-               $this->suppressQuickbar();
-               
                $this->enableClientCache( false );
                $this->mRedirect = '';
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 4082c67..6298deb 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -451,14 +451,14 @@ class SkinTemplate extends Skin {
                $fname = 'SkinTemplate::buildContentActionUrls';
                wfProfileIn( $fname );
                
-               global $wgTitle, $wgUser, $wgOut, $wgRequest, $wgUseValidation;
+               global $wgTitle, $wgUser, $wgRequest, $wgUseValidation;
                $action = $wgRequest->getText( 'action' );
                $section = $wgRequest->getText( 'section' );
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
                $content_actions = array();
 
-               if( $this->iscontent and !$wgOut->isQuickbarSuppressed() ) {
+               if( $this->iscontent ) {
 
                        $nskey = $this->getNameSpaceKey();
                        $is_active = !Namespace::isTalk( $wgTitle->getNamespace()) ;