Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed calls to Linker::tooltipAndAccesskeyAttribs() to be static and fixed casing in method's name

Browse source
This commit is contained in:
Alexandre Emsenhuber 2011-07-04 08:28:27 +00:00
parent 1d08327f4c
commit 8635d5cb65
7 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/EditPage.php
View file

@ -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',

4
includes/HTMLForm.php
View file

@ -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'] );
}
/**

2
includes/HistoryPage.php
View file

@ -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' ) ) {

8
includes/SkinTemplate.php
View file

@ -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'] );

2
includes/specials/SpecialExport.php
View file

@ -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 );

2
includes/specials/SpecialImport.php
View file

@ -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' ).

2
includes/specials/SpecialUserrights.php
View file

@ -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" .