Merge "don't overwrite $item['single-id'] in makeListItem in SkinTemplate"

diff --combined includes/SkinTemplate.php
index b8b1654,f8f29bc..5a32d47
--- 1/includes/SkinTemplate.php
--- 2/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@@ -503,7 -503,6 +503,7 @@@ class SkinTemplate extends Skin 
         * By default it is capitalized.
         *
         * @param $name string Language name, e.g. "English" or "español"
 +       * @return string
         * @private
         */
        function formatLanguageName( $name ) {
@@@ -1444,7 -1443,6 +1444,7 @@@ abstract class BaseTemplate extends Qui
                }
                if ( isset( $this->data['nav_urls']['info'] ) && $this->data['nav_urls']['info'] ) {
                        $toolbox['info'] = $this->data['nav_urls']['info'];
 +                      $toolbox['info']['id'] = 't-info';
                }
  
                wfRunHooks( 'BaseTemplateToolbox', array( &$this, &$toolbox ) );
@@@ -1750,7 -1748,7 +1750,7 @@@
                        foreach ( array( 'id', 'class', 'active', 'tag' ) as $k ) {
                                unset( $link[$k] );
                        }
-                       if ( isset( $item['id'] ) ) {
+                       if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) {
                                // The id goes on the <li> not on the <a> for single links
                                // but makeSidebarLink still needs to know what id to use when
                                // generating tooltips and accesskeys.