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

[lhc/web/wiklou.git] / includes / SkinTemplate.php

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index f8f29bc..5a32d47 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -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 ) {
@@ -1443,6 +1444,7 @@ abstract class BaseTemplate extends QuickTemplate {
                }
                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 ) );