From: Brion Vibber Date: Sat, 4 Dec 2004 05:03:19 +0000 (+0000) Subject: (bug 987) revert broken attempt to fix bug 502, which broke MonoBook tabs in diff... X-Git-Tag: 1.5.0alpha1~1155 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=7e1fe405b1938ac97bba02240f8b197b3ad126bb;p=lhc%2Fweb%2Fwiklou.git (bug 987) revert broken attempt to fix bug 502, which broke MonoBook tabs in diff views and hides the sidebar for error pages in Classic --- diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 31eb28d1e7..667cd78252 100644 --- 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 4082c67587..6298debc66 100644 --- 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()) ;