From 3cfa08995d2324c4b1b35d29e740c2110dad2fda Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 31 Oct 2010 23:46:35 +0000
Subject: [PATCH] Update a few deprecated method calls

---
 includes/EditPage.php                 | 4 ++--
 includes/Linker.php                   | 1 -
 includes/diff/DifferenceInterface.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0c9be60501..386dc807fc 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2283,7 +2283,7 @@ HTML
 			);
 			$checkboxes['minor'] =
 				Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) .
-				"&#160;<label for='wpMinoredit' id='mw-editpage-minoredit'" . $skin->tooltip( 'minoredit', 'withaccess' ) . ">{$minorLabel}</label>";
+				"&#160;<label for='wpMinoredit' id='mw-editpage-minoredit'" . $skin->titleAttrib( 'minoredit', 'withaccess' ) . ">{$minorLabel}</label>";
 		}
 
 		$watchLabel = wfMsgExt( 'watchthis', array( 'parseinline' ) );
@@ -2296,7 +2296,7 @@ HTML
 			);
 			$checkboxes['watch'] =
 				Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) .
-				"&#160;<label for='wpWatchthis' id='mw-editpage-watch'" . $skin->tooltip( 'watch', 'withaccess' ) . ">{$watchLabel}</label>";
+				"&#160;<label for='wpWatchthis' id='mw-editpage-watch'" . $skin->titleAttrib( 'watch', 'withaccess' ) . ">{$watchLabel}</label>";
 		}
 		wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) );
 		return $checkboxes;
diff --git a/includes/Linker.php b/includes/Linker.php
index acedce275c..d0e288f3b2 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2068,7 +2068,6 @@ class Linker {
 		return Xml::expandAttributes( $this->tooltipAndAccesskeyAttribs( $name ) );
 	}
 
-
 	/** @deprecated Returns raw bits of HTML, use titleAttrib() */
 	public function tooltip( $name, $options = null ) {
 		global $wgEnableTooltipsAndAccesskeys;
diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 9392a4ea1e..d85dcfcf44 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -1010,7 +1010,7 @@ CONTROL;
 				'undo' => $this->mNewid
 			) );
 			$htmlLink = htmlspecialchars( wfMsg( 'editundo' ) );
-			$htmlTitle = $wgUser->getSkin()->tooltip( 'undo' );
+			$htmlTitle = $wgUser->getSkin()->titleAttrib( 'undo' );
 			if( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {
 				$this->mNewtitle .= " (<a href='$newUndo' $htmlTitle>" . $htmlLink . "</a>)";
 			}
-- 
2.20.1