Update a few deprecated method calls

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0c9be60..386dc80 100644 (file)
--- 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 acedce2..d0e288f 100644 (file)
--- 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 9392a4e..d85dcfc 100644 (file)
--- 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>)";
                        }