Merge "(bug 42337) Simplify "my talk" link logic in personal tools"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0901d8c..2073f16 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2776,13 +2776,6 @@ $wgFooterIcons = array(
  */
 $wgUseCombinedLoginLink = false;
 
-/**
- *  Appearance of user page and talk page labels in personal tools.
- *  - true = combine links into a single label
- *  - false = keep links in separate labels
- */
-$wgVectorCombineUserTalk = false;
-
 /**
  * Search form look for Vector skin only.
  *  - true = use an icon search button

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e0042c8..7bd1add 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -775,7 +775,6 @@ XHTML id names.
 'moredotdotdot'        => 'More...',
 'mypage'               => 'Page',
 'mytalk'               => 'Talk',
-'mytalk-parenthetical' => 'talk',
 'anontalk'             => 'Talk for this IP address',
 'navigation'           => 'Navigation',
 'and'                  => ' and',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 49f4333..f032064 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -5051,7 +5051,3 @@ $4 is the gender of the target user.',
 * $1 is an unknown warning.',
 'api-error-uploaddisabled' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-verification-error' => 'The word "extension" refers to the part behind the last dot in a file name, that by convention gives a hint about the kind of data format which a files contents are in.',
-
-# Unknown messages
-'mytalk-parenthetical' => 'When user page and talk combined into single label, link title for talk label',
-);

diff --git a/skins/Vector.php b/skins/Vector.php
index 92eb3ad..8d685bd 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -367,7 +367,7 @@ class VectorTemplate extends BaseTemplate {
         * @param $elements array
         */
        protected function renderNavigation( $elements ) {
-               global $wgVectorUseSimpleSearch, $wgVectorCombineUserTalk;
+               global $wgVectorUseSimpleSearch;
 
                // If only one element was given, wrap it in an array, allowing more
                // flexible arguments
@@ -452,20 +452,6 @@ class VectorTemplate extends BaseTemplate {
        <ul<?php $this->html( 'userlangattributes' ) ?>>
 <?php
                                        $personalTools = $this->getPersonalTools();
-                                       if ( $wgVectorCombineUserTalk && isset( $personalTools['userpage'] ) ) {
-?>
-               <li>
-<?php
-                                               echo $this->makeListItem( 'userpage', $personalTools['userpage'], array( 'tag' => 'span' ) );
-?> <?php
-                                               $personalTools['mytalk']['links'][0]['text'] = $this->getMsg( 'mytalk-parenthetical' )->text();
-                                               $talkItem = $this->makeListItem( 'mytalk', $personalTools['mytalk'], array( 'tag' => 'span' ) );
-                                               echo $this->getMsg( 'parentheses' )->rawParams( $talkItem )->escaped();
-                                               unset( $personalTools['userpage'], $personalTools['mytalk'] );
-?>
-               </li>
-<?php
-                                       }
                                        foreach ( $personalTools as $key => $item ) {
                                                echo $this->makeListItem( $key, $item );
                                        }