| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1634,7 +1634,6 @@ |
| 1635 | 1635 | * @return array An array in the format array( $label, $input ) |
| 1636 | 1636 | */ |
| 1637 | 1637 | function getSummaryInput($summary = "", $labelText = null, $inputAttrs = null, $spanLabelAttrs = null) { |
| 1638 | | - global $wgUser; |
| 1639 | 1638 | //Note: the maxlength is overriden in JS to 250 and to make it use UTF-8 bytes, not characters. |
| 1640 | 1639 | $inputAttrs = ( is_array($inputAttrs) ? $inputAttrs : array() ) + array( |
| 1641 | 1640 | 'id' => 'wpSummary', |
| — | — | @@ -1642,7 +1641,7 @@ |
| 1643 | 1642 | 'tabindex' => '1', |
| 1644 | 1643 | 'size' => 60, |
| 1645 | 1644 | 'spellcheck' => 'true', |
| 1646 | | - ) + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'summary' ); |
| | 1645 | + ) + Linker::tooltipAndAccesskeyAttribs( 'summary' ); |
| 1647 | 1646 | |
| 1648 | 1647 | $spanLabelAttrs = ( is_array($spanLabelAttrs) ? $spanLabelAttrs : array() ) + array( |
| 1649 | 1648 | 'class' => $this->missingSummary ? 'mw-summarymissed' : 'mw-summary', |
| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -460,7 +460,7 @@ |
| 461 | 461 | } |
| 462 | 462 | |
| 463 | 463 | if ( isset( $this->mSubmitTooltip ) ) { |
| 464 | | - $attribs += Linker::tooltipAndAccessKeyAttribs( $this->mSubmitTooltip ); |
| | 464 | + $attribs += Linker::tooltipAndAccesskeyAttribs( $this->mSubmitTooltip ); |
| 465 | 465 | } |
| 466 | 466 | |
| 467 | 467 | $attribs['class'] = 'mw-htmlform-submit'; |
| — | — | @@ -1037,7 +1037,7 @@ |
| 1038 | 1038 | if ( empty( $this->mParams['tooltip'] ) ) { |
| 1039 | 1039 | return array(); |
| 1040 | 1040 | } |
| 1041 | | - return Linker::tooltipAndAccessKeyAttribs( $this->mParams['tooltip'] ); |
| | 1041 | + return Linker::tooltipAndAccesskeyAttribs( $this->mParams['tooltip'] ); |
| 1042 | 1042 | } |
| 1043 | 1043 | |
| 1044 | 1044 | /** |
| Index: trunk/phase3/includes/HistoryPage.php |
| — | — | @@ -397,7 +397,7 @@ |
| 398 | 398 | $this->buttons = '<div>'; |
| 399 | 399 | $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions' ), |
| 400 | 400 | array( 'class' => 'historysubmit' ) |
| 401 | | - + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' ) |
| | 401 | + + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' ) |
| 402 | 402 | ) . "\n"; |
| 403 | 403 | |
| 404 | 404 | if ( $wgUser->isAllowed( 'deleterevision' ) ) { |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -1594,7 +1594,7 @@ |
| 1595 | 1595 | } else { |
| 1596 | 1596 | $attrs = array_merge( |
| 1597 | 1597 | $attrs, |
| 1598 | | - $this->skin->tooltipAndAccesskeyAttribs( $item['single-id'] ) |
| | 1598 | + Linker::tooltipAndAccesskeyAttribs( $item['single-id'] ) |
| 1599 | 1599 | ); |
| 1600 | 1600 | } |
| 1601 | 1601 | } |
| — | — | @@ -1665,7 +1665,7 @@ |
| 1666 | 1666 | 'name' => 'search', |
| 1667 | 1667 | 'value' => isset( $this->data['search'] ) ? $this->data['search'] : '', |
| 1668 | 1668 | ); |
| 1669 | | - $realAttrs = array_merge( $realAttrs, $this->skin->tooltipAndAccesskeyAttribs( 'search' ), $attrs ); |
| | 1669 | + $realAttrs = array_merge( $realAttrs, Linker::tooltipAndAccesskeyAttribs( 'search' ), $attrs ); |
| 1670 | 1670 | return Html::element( 'input', $realAttrs ); |
| 1671 | 1671 | } |
| 1672 | 1672 | |
| — | — | @@ -1681,7 +1681,7 @@ |
| 1682 | 1682 | ); |
| 1683 | 1683 | $realAttrs = array_merge( |
| 1684 | 1684 | $realAttrs, |
| 1685 | | - $this->skin->tooltipAndAccesskeyAttribs( "search-$mode" ), |
| | 1685 | + Linker::tooltipAndAccesskeyAttribs( "search-$mode" ), |
| 1686 | 1686 | $attrs |
| 1687 | 1687 | ); |
| 1688 | 1688 | return Html::element( 'input', $realAttrs ); |
| — | — | @@ -1692,7 +1692,7 @@ |
| 1693 | 1693 | ); |
| 1694 | 1694 | $buttonAttrs = array_merge( |
| 1695 | 1695 | $buttonAttrs, |
| 1696 | | - $this->skin->tooltipAndAccesskeyAttribs( 'search-fulltext' ), |
| | 1696 | + Linker::tooltipAndAccesskeyAttribs( 'search-fulltext' ), |
| 1697 | 1697 | $attrs |
| 1698 | 1698 | ); |
| 1699 | 1699 | unset( $buttonAttrs['src'] ); |
| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -463,7 +463,7 @@ |
| 464 | 464 | <td></td> |
| 465 | 465 | <td class='mw-submit'>" . |
| 466 | 466 | Xml::submitButton( wfMsg( 'saveusergroups' ), |
| 467 | | - array( 'name' => 'saveusergroups' ) + $this->getSkin()->tooltipAndAccessKeyAttribs( 'userrights-set' ) ) . |
| | 467 | + array( 'name' => 'saveusergroups' ) + Linker::tooltipAndAccesskeyAttribs( 'userrights-set' ) ) . |
| 468 | 468 | "</td> |
| 469 | 469 | </tr>" . |
| 470 | 470 | Xml::closeElement( 'table' ) . "\n" . |
| Index: trunk/phase3/includes/specials/SpecialImport.php |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | <td> |
| 294 | 294 | </td> |
| 295 | 295 | <td class='mw-submit'>" . |
| 296 | | - Xml::submitButton( wfMsg( 'import-interwiki-submit' ), $this->getSkin()->tooltipAndAccessKeyAttribs( 'import' ) ) . |
| | 296 | + Xml::submitButton( wfMsg( 'import-interwiki-submit' ), Linker::tooltipAndAccesskeyAttribs( 'import' ) ) . |
| 297 | 297 | "</td> |
| 298 | 298 | </tr>" . |
| 299 | 299 | Xml::closeElement( 'table' ). |
| Index: trunk/phase3/includes/specials/SpecialExport.php |
| — | — | @@ -215,7 +215,7 @@ |
| 216 | 216 | $wgRequest->wasPosted() ? $wgRequest->getCheck( 'wpDownload' ) : true |
| 217 | 217 | ) . '<br />'; |
| 218 | 218 | |
| 219 | | - $form .= Xml::submitButton( wfMsg( 'export-submit' ), $this->getSkin()->tooltipAndAccessKeyAttribs( 'export' ) ); |
| | 219 | + $form .= Xml::submitButton( wfMsg( 'export-submit' ), Linker::tooltipAndAccesskeyAttribs( 'export' ) ); |
| 220 | 220 | $form .= Xml::closeElement( 'form' ); |
| 221 | 221 | |
| 222 | 222 | $wgOut->addHTML( $form ); |