Fix bug http://bugzilla.wikipedia.org/show_bug.cgi?id=502 . Implement allow quickbar...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index abecaa9..8ad8765 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -20,6 +20,7 @@ Major changes from 1.3.x:
 * Skins system more modular: templates and CSS are now in /skins/
 * New user preference for limitting the image size for images on image description
   pages 
+* Error pages no more offer edit / talk / watch links (bug #502)
 * ... and more!
 
 === Caveats ===

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d51697f..a7af044 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Id$
+ * @version $Id$
  * @package MediaWiki
  */
 
@@ -506,6 +506,8 @@ class OutputPage {
                $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
                $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
+               $this->suppressQuickbar();
+               
                $this->enableClientCache( false );
                $this->mRedirect = '';
 

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 0000dfc..0a5fe47 100644 (file)
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -358,14 +358,14 @@ class SkinPHPTal extends Skin {
         * an array of edit links by default used for the tabs
         */
        function buildContentActionUrls () {
-               global $wgTitle, $wgUser, $wgRequest, $wgUseValidation;
+               global $wgTitle, $wgUser, $wgOut, $wgRequest, $wgUseValidation;
                $action = $wgRequest->getText( 'action' );
                $section = $wgRequest->getText( 'section' );
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
                $content_actions = array();
 
-               if( $this->iscontent ) {
+               if( $this->iscontent and !$wgOut->isQuickbarSuppressed() ) {
 
                        $nskey = $this->getNameSpaceKey();
                        $is_active = !Namespace::isTalk( $wgTitle->getNamespace()) ;