Merge "Follow up: I1b017e13 - Fix Strict Standards"

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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 173d37a..a24ece5 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1777,6 +1777,13 @@ abstract class BaseTemplate extends QuickTemplate {
                        $attrs['class'] .= ' active';
                        $attrs['class'] = trim( $attrs['class'] );
                }
+
+               // A special case for the talk link in personal tools.
+               // See bug 41672 and 42337.
+               if ( $key === 'mytalk' ) {
+                       $html = $this->getMsg( 'parentheses' )->rawParams( $html )->escaped();
+               }
+
                return Html::rawElement( isset( $options['tag'] ) ? $options['tag'] : 'li', $attrs, $html );
        }