https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103047
Revision: 103047
Author: dantman
Date: 2011-11-14 21:57:36 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
Add isset tests to stuff inside BaseTemplate::getToolbox.
Modified Paths:
--------------
trunk/phase3/includes/SkinTemplate.php
Modified: trunk/phase3/includes/SkinTemplate.php
===================================================================
--- trunk/phase3/includes/SkinTemplate.php 2011-11-14 21:55:46 UTC (rev
103046)
+++ trunk/phase3/includes/SkinTemplate.php 2011-11-14 21:57:36 UTC (rev
103047)
@@ -1411,20 +1411,20 @@
wfProfileIn( __METHOD__ );
$toolbox = array();
- if ( $this->data['nav_urls']['whatlinkshere'] ) {
+ if ( isset( $this->data['nav_urls']['whatlinkshere'] ) &&
$this->data['nav_urls']['whatlinkshere'] ) {
$toolbox['whatlinkshere'] =
$this->data['nav_urls']['whatlinkshere'];
$toolbox['whatlinkshere']['id'] = 't-whatlinkshere';
}
- if ( $this->data['nav_urls']['recentchangeslinked'] ) {
+ if ( isset( $this->data['nav_urls']['recentchangeslinked'] ) &&
$this->data['nav_urls']['recentchangeslinked'] ) {
$toolbox['recentchangeslinked'] =
$this->data['nav_urls']['recentchangeslinked'];
$toolbox['recentchangeslinked']['msg'] =
'recentchangeslinked-toolbox';
$toolbox['recentchangeslinked']['id'] =
't-recentchangeslinked';
}
- if ( $this->data['nav_urls']['trackbacklink'] ) {
+ if ( isset( $this->data['nav_urls']['trackbacklink'] ) &&
$this->data['nav_urls']['trackbacklink'] ) {
$toolbox['trackbacklink'] =
$this->data['nav_urls']['trackbacklink'];
$toolbox['trackbacklink']['id'] = 't-trackbacklink';
}
- if ( $this->data['feeds'] ) {
+ if ( isset( $this->data['feeds'] ) && $this->data['feeds'] ) {
$toolbox['feeds']['id'] = 'feedlinks';
$toolbox['feeds']['links'] = array();
foreach ( $this->data['feeds'] as $key => $feed ) {
@@ -1436,17 +1436,17 @@
}
}
foreach ( array( 'contributions', 'log', 'blockip',
'emailuser', 'upload', 'specialpages' ) as $special ) {
- if ( $this->data['nav_urls'][$special] ) {
+ if ( isset( $this->data['nav_urls'][$special] ) &&
$this->data['nav_urls'][$special] ) {
$toolbox[$special] =
$this->data['nav_urls'][$special];
$toolbox[$special]['id'] = "t-$special";
}
}
- if ( $this->data['nav_urls']['print'] ) {
+ if ( isset( $this->data['nav_urls']['print'] ) &&
$this->data['nav_urls']['print'] ) {
$toolbox['print'] = $this->data['nav_urls']['print'];
$toolbox['print']['rel'] = 'alternate';
$toolbox['print']['msg'] = 'printableversion';
}
- if( $this->data['nav_urls']['permalink'] ) {
+ if ( isset( $this->data['nav_urls']['permalink'] ) &&
$this->data['nav_urls']['permalink'] ) {
$toolbox['permalink'] =
$this->data['nav_urls']['permalink'];
if( $toolbox['permalink']['href'] === '' ) {
unset( $toolbox['permalink']['href'] );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
