Merge changes I4ac3bc14,I470acb8b

* changes:
  make addPortletLink work with CologneBlue
  (bug 18338) WAI-ARIA landmark roles in most used skins

diff --cc resources/mediawiki/mediawiki.util.js
Simple merge

diff --cc skins/Vector.php
index 227d18d,c30a1cd..104cdde
--- 1/skins/Vector.php
--- 2/skins/Vector.php
+++ b/skins/Vector.php
@@@ -441,29 -441,13 +441,29 @@@ class VectorTemplate extends BaseTempla
                                break;
                                case 'PERSONAL':
  ?>
- <div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
+ <div id="p-personal" role="navigation" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
        <h5><?php $this->msg( 'personaltools' ) ?></h5>
        <ul<?php $this->html( 'userlangattributes' ) ?>>
 -<?php                 foreach( $this->getPersonalTools() as $key => $item ) { ?>
 -              <?php echo $this->makeListItem( $key, $item ); ?>
 -
 -<?php                 } ?>
 +<?php
 +                                      $personalTools = $this->getPersonalTools();
 +                                      if ( $wgVectorCombineUserTalk && isset( $personalTools['userpage'] ) ) {
 +?>
 +              <li>
 +<?php
 +                                              echo $this->makeListItem( 'userpage', $personalTools['userpage'], array( 'tag' => 'span' ) );
 +?> <?php
 +                                              $personalTools['mytalk']['links'][0]['text'] = $this->getMsg( 'mytalk-parenthetical' )->text();
 +                                              $talkItem = $this->makeListItem( 'mytalk', $personalTools['mytalk'], array( 'tag' => 'span' ) );
 +                                              echo $this->getMsg( 'parentheses' )->rawParams( $talkItem )->escaped();
 +                                              unset( $personalTools['userpage'], $personalTools['mytalk'] );
 +?>
 +              </li>
 +<?php
 +                                      }
 +                                      foreach ( $personalTools as $key => $item ) {
 +                                              echo $this->makeListItem( $key, $item );
 +                                      }
 +?>
        </ul>
  </div>
  <?php