From: MatmaRex <matma.rex@gmail.com>
Date: Fri, 5 Oct 2012 18:09:18 +0000 (+0200)
Subject: don't overwrite $item['single-id'] in makeListItem in SkinTemplate
X-Git-Tag: 1.31.0-rc.0~21923^2~1
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=33c1b6042f73b601c245a32f9dd66e3f9f131357;p=lhc%2Fweb%2Fwiklou.git

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

This makes it possible to use it with links that are supposed to use
custom ids, but stock tooltips.

Change-Id: I2e3ed92bd23dbaebf0c404979343b463c8c357cf
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index c6547473cb..f8f29bc86d 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1748,7 +1748,7 @@ abstract class BaseTemplate extends QuickTemplate {
 			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.