| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -373,17 +373,18 @@ |
| 374 | 374 | $nav = $this->skin->buildNavigationUrls(); |
| 375 | 375 | foreach ( $nav as $section => $links ) { |
| 376 | 376 | foreach ( $links as $key => $link ) { |
| 377 | | - $insert = ''; |
| | 377 | + $xmlID = $key; |
| 378 | 378 | if ( isset( $link['context'] ) ) { |
| 379 | 379 | if ( $link['context'] == 'subject' ) { |
| 380 | | - $insert = 'nstab-'; |
| | 380 | + $xmlID = 'ca-nstab-' . $xmlID; |
| | 381 | + } else if ( $link['context'] == 'talk' ) { |
| | 382 | + $xmlID = 'ca-talk'; |
| | 383 | + } else { |
| | 384 | + $xmlID = 'ca-' . $xmlID; |
| 381 | 385 | } |
| 382 | | - if ( $link['context'] == 'talk' ) { |
| 383 | | - $key = 'talk'; |
| 384 | | - } |
| 385 | 386 | } |
| 386 | 387 | $nav[$section][$key]['attributes'] = |
| 387 | | - ' id="' . Sanitizer::escapeId( "ca-{$insert}{$key}" ) . '"'; |
| | 388 | + ' id="' . Sanitizer::escapeId( $xmlID ) . '"'; |
| 388 | 389 | if ( $nav[$section][$key]['class'] ) { |
| 389 | 390 | $nav[$section][$key]['attributes'] .= |
| 390 | 391 | ' class="' . htmlspecialchars( $link['class'] ) . '"'; |
| — | — | @@ -398,10 +399,10 @@ |
| 399 | 400 | in_array( $key, array( 'edit', 'watch', 'unwatch' ) ) |
| 400 | 401 | ) { |
| 401 | 402 | $nav[$section][$key]['key'] = |
| 402 | | - $this->skin->tooltip( "ca-{$insert}{$key}" ); |
| | 403 | + $this->skin->tooltip( $xmlID ); |
| 403 | 404 | } else { |
| 404 | 405 | $nav[$section][$key]['key'] = |
| 405 | | - $this->skin->tooltipAndAccesskey( "ca-{$insert}{$key}" ); |
| | 406 | + $this->skin->tooltipAndAccesskey( $xmlID ); |
| 406 | 407 | } |
| 407 | 408 | } |
| 408 | 409 | } |