From 8635d5cb65d83e3f5d2cc2cd9e8a12376d5afe61 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Mon, 4 Jul 2011 08:28:27 +0000 Subject: [PATCH] Changed calls to Linker::tooltipAndAccesskeyAttribs() to be static and fixed casing in method's name --- includes/EditPage.php | 3 +-- includes/HTMLForm.php | 4 ++-- includes/HistoryPage.php | 2 +- includes/SkinTemplate.php | 8 ++++---- includes/specials/SpecialExport.php | 2 +- includes/specials/SpecialImport.php | 2 +- includes/specials/SpecialUserrights.php | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 457b2b586c..aa33ec4335 100644 --- 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 f2f514cdc9..f560590635 100644 --- 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 593e10590e..678c24b109 100644 --- a/includes/HistoryPage.php +++ b/includes/HistoryPage.php @@ -397,7 +397,7 @@ class HistoryPager extends ReverseChronologicalPager { $this->buttons = '
'; $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 598dc1354c..e4ff9cb243 100644 --- 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 8968ec2748..50754b6a92 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -215,7 +215,7 @@ class SpecialExport extends SpecialPage { $wgRequest->wasPosted() ? $wgRequest->getCheck( 'wpDownload' ) : true ) . '
'; - $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 affaa124e5..fc904a23e6 100644 --- a/includes/specials/SpecialImport.php +++ b/includes/specials/SpecialImport.php @@ -292,7 +292,7 @@ class SpecialImport extends SpecialPage { " . - Xml::submitButton( wfMsg( 'import-interwiki-submit' ), $this->getSkin()->tooltipAndAccessKeyAttribs( 'import' ) ) . + Xml::submitButton( wfMsg( 'import-interwiki-submit' ), Linker::tooltipAndAccesskeyAttribs( 'import' ) ) . " " . Xml::closeElement( 'table' ). diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index 483baf098b..4de048c0a5 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -463,7 +463,7 @@ class UserrightsPage extends SpecialPage { " . Xml::submitButton( wfMsg( 'saveusergroups' ), - array( 'name' => 'saveusergroups' ) + $this->getSkin()->tooltipAndAccessKeyAttribs( 'userrights-set' ) ) . + array( 'name' => 'saveusergroups' ) + Linker::tooltipAndAccesskeyAttribs( 'userrights-set' ) ) . " " . Xml::closeElement( 'table' ) . "\n" . -- 2.20.1