| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -20,6 +20,7 @@ |
| 21 | 21 | * Skins system more modular: templates and CSS are now in /skins/ |
| 22 | 22 | * New user preference for limitting the image size for images on image description |
| 23 | 23 | pages |
| | 24 | +* Error pages no more offer edit / talk / watch links (bug #502) |
| 24 | 25 | * ... and more! |
| 25 | 26 | |
| 26 | 27 | === Caveats === |
| Index: trunk/phase3/includes/SkinPHPTal.php |
| — | — | @@ -358,14 +358,14 @@ |
| 359 | 359 | * an array of edit links by default used for the tabs |
| 360 | 360 | */ |
| 361 | 361 | function buildContentActionUrls () { |
| 362 | | - global $wgTitle, $wgUser, $wgRequest, $wgUseValidation; |
| | 362 | + global $wgTitle, $wgUser, $wgOut, $wgRequest, $wgUseValidation; |
| 363 | 363 | $action = $wgRequest->getText( 'action' ); |
| 364 | 364 | $section = $wgRequest->getText( 'section' ); |
| 365 | 365 | $oldid = $wgRequest->getVal( 'oldid' ); |
| 366 | 366 | $diff = $wgRequest->getVal( 'diff' ); |
| 367 | 367 | $content_actions = array(); |
| 368 | 368 | |
| 369 | | - if( $this->iscontent ) { |
| | 369 | + if( $this->iscontent and !$wgOut->isQuickbarSuppressed() ) { |
| 370 | 370 | |
| 371 | 371 | $nskey = $this->getNameSpaceKey(); |
| 372 | 372 | $is_active = !Namespace::isTalk( $wgTitle->getNamespace()) ; |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | /** |
| 4 | | - * $Id$ |
| | 4 | + * @version $Id$ |
| 5 | 5 | * @package MediaWiki |
| 6 | 6 | */ |
| 7 | 7 | |
| — | — | @@ -506,6 +506,8 @@ |
| 507 | 507 | $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) ); |
| 508 | 508 | $this->setRobotpolicy( 'noindex,nofollow' ); |
| 509 | 509 | $this->setArticleRelated( false ); |
| | 510 | + $this->suppressQuickbar(); |
| | 511 | + |
| 510 | 512 | $this->enableClientCache( false ); |
| 511 | 513 | $this->mRedirect = ''; |
| 512 | 514 | |