dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Deprecating: Consolidating `progressive` & `constructive` buttons"
[lhc/web/wiklou.git]
/
includes
/
skins
/
BaseTemplate.php
diff --git
a/includes/skins/BaseTemplate.php
b/includes/skins/BaseTemplate.php
index
25df0f9
..
85b17f9
100644
(file)
--- a/
includes/skins/BaseTemplate.php
+++ b/
includes/skins/BaseTemplate.php
@@
-358,21
+358,28
@@
abstract class BaseTemplate extends QuickTemplate {
if ( isset( $item['href'] ) || isset( $options['link-fallback'] ) ) {
$attrs = $item;
if ( isset( $item['href'] ) || isset( $options['link-fallback'] ) ) {
$attrs = $item;
- foreach ( array( 'single-id', 'text', 'msg', 'tooltiponly', 'context', 'primary' ) as $k ) {
+ foreach ( array( 'single-id', 'text', 'msg', 'tooltiponly', 'context', 'primary',
+ 'tooltip-params' ) as $k ) {
unset( $attrs[$k] );
}
if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) {
$item['single-id'] = $item['id'];
}
unset( $attrs[$k] );
}
if ( isset( $item['id'] ) && !isset( $item['single-id'] ) ) {
$item['single-id'] = $item['id'];
}
+
+ $tooltipParams = array();
+ if ( isset( $item['tooltip-params'] ) ) {
+ $tooltipParams = $item['tooltip-params'];
+ }
+
if ( isset( $item['single-id'] ) ) {
if ( isset( $item['tooltiponly'] ) && $item['tooltiponly'] ) {
if ( isset( $item['single-id'] ) ) {
if ( isset( $item['tooltiponly'] ) && $item['tooltiponly'] ) {
- $title = Linker::titleAttrib( $item['single-id'] );
+ $title = Linker::titleAttrib( $item['single-id']
, null, $tooltipParams
);
if ( $title !== false ) {
$attrs['title'] = $title;
}
} else {
if ( $title !== false ) {
$attrs['title'] = $title;
}
} else {
- $tip = Linker::tooltipAndAccesskeyAttribs( $item['single-id'] );
+ $tip = Linker::tooltipAndAccesskeyAttribs( $item['single-id']
, $tooltipParams
);
if ( isset( $tip['title'] ) && $tip['title'] !== false ) {
$attrs['title'] = $tip['title'];
}
if ( isset( $tip['title'] ) && $tip['title'] !== false ) {
$attrs['title'] = $tip['title'];
}
@@
-567,7
+574,7
@@
abstract class BaseTemplate extends QuickTemplate {
* display the text from footericons instead of the images and don't want a
* duplicate copyright statement because footerlinks already rendered one.
* @param string $option
* display the text from footericons instead of the images and don't want a
* duplicate copyright statement because footerlinks already rendered one.
* @param string $option
- * @return
string
+ * @return
array
*/
function getFooterIcons( $option = null ) {
// Generate additional footer icons
*/
function getFooterIcons( $option = null ) {
// Generate additional footer icons