Revert r89123 -- caused bug 30259 (switched correct calls with incorrect calls because of some interpretation of 'deprecation', causing invalid HTML output and breakage of watch tab on edit page)

1 files changed, 2 insertions, 4 deletions

diff --git a/skins/Vector.php b/skins/Vector.php
index e0d87a8f4e25..ac65b1f9ffed 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -108,7 +108,7 @@ class VectorTemplate extends BaseTemplate {
 				}
 				if ( isset( $link['tooltiponly'] ) && $link['tooltiponly'] ) {
 					$nav[$section][$key]['key'] =
-						Linker::titleAttrib( $xmlID );
+						Linker::tooltip( $xmlID );
 				} else {
 					$nav[$section][$key]['key'] =
 						Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
@@ -302,7 +302,7 @@ class VectorTemplate extends BaseTemplate {
 			$msg = $name;
 		}
 		?>
-<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::titleAttrib( 'p-' . $name ) ?>>
+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
 	<h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h5>
 	<div class="body">
 <?php
@@ -332,8 +332,6 @@ class VectorTemplate extends BaseTemplate {
 	/**
 	 * Render one or more navigations elements by name, automatically reveresed
 	 * when UI is in RTL mode
-	 *
-	 * @param $elements array
 	 */
 	private function renderNavigation( $elements ) {
 		global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang;