Index: trunk/phase3/includes/SkinTemplate.php |
— | — | @@ -1411,20 +1411,20 @@ |
1412 | 1412 | wfProfileIn( __METHOD__ ); |
1413 | 1413 | |
1414 | 1414 | $toolbox = array(); |
1415 | | - if ( $this->data['nav_urls']['whatlinkshere'] ) { |
| 1415 | + if ( isset( $this->data['nav_urls']['whatlinkshere'] ) && $this->data['nav_urls']['whatlinkshere'] ) { |
1416 | 1416 | $toolbox['whatlinkshere'] = $this->data['nav_urls']['whatlinkshere']; |
1417 | 1417 | $toolbox['whatlinkshere']['id'] = 't-whatlinkshere'; |
1418 | 1418 | } |
1419 | | - if ( $this->data['nav_urls']['recentchangeslinked'] ) { |
| 1419 | + if ( isset( $this->data['nav_urls']['recentchangeslinked'] ) && $this->data['nav_urls']['recentchangeslinked'] ) { |
1420 | 1420 | $toolbox['recentchangeslinked'] = $this->data['nav_urls']['recentchangeslinked']; |
1421 | 1421 | $toolbox['recentchangeslinked']['msg'] = 'recentchangeslinked-toolbox'; |
1422 | 1422 | $toolbox['recentchangeslinked']['id'] = 't-recentchangeslinked'; |
1423 | 1423 | } |
1424 | | - if ( $this->data['nav_urls']['trackbacklink'] ) { |
| 1424 | + if ( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) { |
1425 | 1425 | $toolbox['trackbacklink'] = $this->data['nav_urls']['trackbacklink']; |
1426 | 1426 | $toolbox['trackbacklink']['id'] = 't-trackbacklink'; |
1427 | 1427 | } |
1428 | | - if ( $this->data['feeds'] ) { |
| 1428 | + if ( isset( $this->data['feeds'] ) && $this->data['feeds'] ) { |
1429 | 1429 | $toolbox['feeds']['id'] = 'feedlinks'; |
1430 | 1430 | $toolbox['feeds']['links'] = array(); |
1431 | 1431 | foreach ( $this->data['feeds'] as $key => $feed ) { |
— | — | @@ -1436,17 +1436,17 @@ |
1437 | 1437 | } |
1438 | 1438 | } |
1439 | 1439 | foreach ( array( 'contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages' ) as $special ) { |
1440 | | - if ( $this->data['nav_urls'][$special] ) { |
| 1440 | + if ( isset( $this->data['nav_urls'][$special] ) && $this->data['nav_urls'][$special] ) { |
1441 | 1441 | $toolbox[$special] = $this->data['nav_urls'][$special]; |
1442 | 1442 | $toolbox[$special]['id'] = "t-$special"; |
1443 | 1443 | } |
1444 | 1444 | } |
1445 | | - if ( $this->data['nav_urls']['print'] ) { |
| 1445 | + if ( isset( $this->data['nav_urls']['print'] ) && $this->data['nav_urls']['print'] ) { |
1446 | 1446 | $toolbox['print'] = $this->data['nav_urls']['print']; |
1447 | 1447 | $toolbox['print']['rel'] = 'alternate'; |
1448 | 1448 | $toolbox['print']['msg'] = 'printableversion'; |
1449 | 1449 | } |
1450 | | - if( $this->data['nav_urls']['permalink'] ) { |
| 1450 | + if ( isset( $this->data['nav_urls']['permalink'] ) && $this->data['nav_urls']['permalink'] ) { |
1451 | 1451 | $toolbox['permalink'] = $this->data['nav_urls']['permalink']; |
1452 | 1452 | if( $toolbox['permalink']['href'] === '' ) { |
1453 | 1453 | unset( $toolbox['permalink']['href'] ); |