Changed calls to Linker::tooltipAndAccesskeyAttribs() to be static and fixed casing...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 457b2b5..aa33ec4 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1634,7 +1634,6 @@ HTML
         * @return array An array in the format array( $label, $input )
         */
        function getSummaryInput($summary = "", $labelText = null, $inputAttrs = null, $spanLabelAttrs = null) {
-               global $wgUser;
                //Note: the maxlength is overriden in JS to 250 and to make it use UTF-8 bytes, not characters.
                $inputAttrs = ( is_array($inputAttrs) ? $inputAttrs : array() ) + array(
                        'id' => 'wpSummary',
@@ -1642,7 +1641,7 @@ HTML
                        'tabindex' => '1',
                        'size' => 60,
                        'spellcheck' => 'true',
-               ) + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'summary' );
+               ) + Linker::tooltipAndAccesskeyAttribs( 'summary' );
 
                $spanLabelAttrs = ( is_array($spanLabelAttrs) ? $spanLabelAttrs : array() ) + array(
                        'class' => $this->missingSummary ? 'mw-summarymissed' : 'mw-summary',

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index f2f514c..f560590 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -460,7 +460,7 @@ class HTMLForm {
                }
 
                if ( isset( $this->mSubmitTooltip ) ) {
-                       $attribs += Linker::tooltipAndAccessKeyAttribs( $this->mSubmitTooltip );
+                       $attribs += Linker::tooltipAndAccesskeyAttribs( $this->mSubmitTooltip );
                }
 
                $attribs['class'] = 'mw-htmlform-submit';
@@ -1037,7 +1037,7 @@ abstract class HTMLFormField {
                if ( empty( $this->mParams['tooltip'] ) ) {
                        return array();
                }
-               return Linker::tooltipAndAccessKeyAttribs( $this->mParams['tooltip'] );
+               return Linker::tooltipAndAccesskeyAttribs( $this->mParams['tooltip'] );
        }
 
        /**

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index 593e105..678c24b 100644 (file)
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -397,7 +397,7 @@ class HistoryPager extends ReverseChronologicalPager {
                $this->buttons = '<div>';
                $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions' ),
                        array( 'class' => 'historysubmit' )
-                               + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
+                               + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' )
                ) . "\n";
 
                if ( $wgUser->isAllowed( 'deleterevision' ) ) {

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 598dc13..e4ff9cb 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1594,7 +1594,7 @@ abstract class BaseTemplate extends QuickTemplate {
                        } else {
                                $attrs = array_merge(
                                        $attrs,
-                                       $this->skin->tooltipAndAccesskeyAttribs( $item['single-id'] )
+                                       Linker::tooltipAndAccesskeyAttribs( $item['single-id'] )
                                );
                        }
                }
@@ -1665,7 +1665,7 @@ abstract class BaseTemplate extends QuickTemplate {
                        'name' => 'search',
                        'value' => isset( $this->data['search'] ) ? $this->data['search'] : '',
                );
-               $realAttrs = array_merge( $realAttrs, $this->skin->tooltipAndAccesskeyAttribs( 'search' ), $attrs );
+               $realAttrs = array_merge( $realAttrs, Linker::tooltipAndAccesskeyAttribs( 'search' ), $attrs );
                return Html::element( 'input', $realAttrs );
        }
 
@@ -1681,7 +1681,7 @@ abstract class BaseTemplate extends QuickTemplate {
                                );
                                $realAttrs = array_merge(
                                        $realAttrs,
-                                       $this->skin->tooltipAndAccesskeyAttribs( "search-$mode" ),
+                                       Linker::tooltipAndAccesskeyAttribs( "search-$mode" ),
                                        $attrs
                                );
                                return Html::element( 'input', $realAttrs );
@@ -1692,7 +1692,7 @@ abstract class BaseTemplate extends QuickTemplate {
                                );
                                $buttonAttrs = array_merge(
                                        $buttonAttrs,
-                                       $this->skin->tooltipAndAccesskeyAttribs( 'search-fulltext' ),
+                                       Linker::tooltipAndAccesskeyAttribs( 'search-fulltext' ),
                                        $attrs
                                );
                                unset( $buttonAttrs['src'] );

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 8968ec2..50754b6 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -215,7 +215,7 @@ class SpecialExport extends SpecialPage {
                        $wgRequest->wasPosted() ? $wgRequest->getCheck( 'wpDownload' ) : true
                ) . '<br />';
 
-               $form .= Xml::submitButton( wfMsg( 'export-submit' ), $this->getSkin()->tooltipAndAccessKeyAttribs( 'export' ) );
+               $form .= Xml::submitButton( wfMsg( 'export-submit' ), Linker::tooltipAndAccesskeyAttribs( 'export' ) );
                $form .= Xml::closeElement( 'form' );
 
                $wgOut->addHTML( $form );

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index affaa12..fc904a2 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -292,7 +292,7 @@ class SpecialImport extends SpecialPage {
                                        <td>
                                        </td>
                                        <td class='mw-submit'>" .
-                                               Xml::submitButton( wfMsg( 'import-interwiki-submit' ), $this->getSkin()->tooltipAndAccessKeyAttribs( 'import' ) ) .
+                                               Xml::submitButton( wfMsg( 'import-interwiki-submit' ), Linker::tooltipAndAccesskeyAttribs( 'import' ) ) .
                                        "</td>
                                </tr>" .
                                Xml::closeElement( 'table' ).

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 483baf0..4de048c 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -463,7 +463,7 @@ class UserrightsPage extends SpecialPage {
                                        <td></td>
                                        <td class='mw-submit'>" .
                                                Xml::submitButton( wfMsg( 'saveusergroups' ),
-                                                       array( 'name' => 'saveusergroups' ) + $this->getSkin()->tooltipAndAccessKeyAttribs( 'userrights-set' ) ) .
+                                                       array( 'name' => 'saveusergroups' ) + Linker::tooltipAndAccesskeyAttribs( 'userrights-set' ) ) .
                                        "</td>
                                </tr>" .
                        Xml::closeElement( 'table' ) . "\n" .