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

Merge "Fix parameter name"

Browse source
This commit is contained in:
jenkins-bot 2016-11-10 09:47:56 +00:00 committed by Gerrit Code Review
commit 653bc72b20
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/EditPage.php
View file

@ -4412,16 +4412,16 @@ HTML
/**
* @param string $name
* @param mixed[] $customAttribs
* @param User $wgUser
* @param User $user
* @return mixed[]
* @since 1.29
*/
protected function buildTextboxAttribs( $name, array $customAttribs, User $wgUser ) {
protected function buildTextboxAttribs( $name, array $customAttribs, User $user ) {
$attribs = $customAttribs + [
'accesskey' => ',',
'id' => $name,
'cols' => $wgUser->getIntOption( 'cols' ),
'rows' => $wgUser->getIntOption( 'rows' ),
'cols' => $user->getIntOption( 'cols' ),
'rows' => $user->getIntOption( 'rows' ),
// Avoid PHP notices when appending preferences
// (appending allows customAttribs['style'] to still work).
'style' => ''
@ -4432,7 +4432,7 @@ HTML
// * mw-editfont-monospace
// * mw-editfont-sans-serif
// * mw-editfont-serif
$class = 'mw-editfont-' . $wgUser->getOption( 'editfont' );
$class = 'mw-editfont-' . $user->getOption( 'editfont' );
if ( isset( $attribs['class'] ) ) {
if ( is_string( $attribs['class'] ) ) {