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

Followup bug #27447 and r82308 and r82328 with patch supplied by

Browse source 
Carsten Nielsen to take care of the warning and supply some
documentation.  Also fixed up language in the comments.
This commit is contained in:
Mark A. Hershberger 2011-02-17 18:41:44 +00:00
parent e519eadc99
commit ef74c0a178
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
includes/EditPage.php
View file

@ -2256,16 +2256,19 @@ HTML
$imagesAvailable = $wgEnableUploads || count( $wgForeignFileRepos ); $imagesAvailable = $wgEnableUploads || count( $wgForeignFileRepos );
/** /**
* $toolarray is an array of arrays each of which includes the
* toolarray an array of arrays which each include the filename of * filename of the button image (without path), the opening
* the button image (without path), the opening tag, the closing tag, * tag, the closing tag, optionally a sample text that is
* and optionally a sample text that is inserted between the two when no * inserted between the two when no selection is highlighted
* selection is highlighted. * and an option to select which switches the automatic
* The tip text is shown when the user moves the mouse over the button. * selection of inserted text (default is true, see
* mw-editbutton-image). The tip text is shown when the user
* moves the mouse over the button.
* *
* Already here are accesskeys (key), which are not used yet until someone * Also here: accesskeys (key), which are not used yet until
* can figure out a way to make them work in IE. However, we should make * someone can figure out a way to make them work in
* sure these keys are not defined on the edit page. * IE. However, we should make sure these keys are not defined
* on the edit page.
*/ */
$toolarray = array( $toolarray = array(
array( array(
@ -2320,7 +2323,8 @@ HTML
'close' => ']]', 'close' => ']]',
'sample' => wfMsg( 'image_sample' ), 'sample' => wfMsg( 'image_sample' ),
'tip' => wfMsg( 'image_tip' ), 'tip' => wfMsg( 'image_tip' ),
'key' => 'D' 'key' => 'D',
'select' => true
) : false, ) : false,
$imagesAvailable ? array( $imagesAvailable ? array(
'image' => $wgLang->getImageFile( 'button-media' ), 'image' => $wgLang->getImageFile( 'button-media' ),
@ -2376,6 +2380,10 @@ HTML
continue; continue;
} }
if( !isset( $tool['select'] ) ) {
$tool['select'] = true;
}
$params = array( $params = array(
$image = $wgStylePath . '/common/images/' . $tool['image'], $image = $wgStylePath . '/common/images/' . $tool['image'],
// Note that we use the tip both for the ALT tag and the TITLE tag of the image. // Note that we use the tip both for the ALT tag and the TITLE tag of the image.