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

Html: Don't accept paths relative to skins/common/images/ in infoBox()

Browse source 
There are no files worth referencing there anymore.

No usages found in extensions, only one usage in core already didn't
depend on that behavior.

Change-Id: If1fd68a3a7355c8195fd2aad86e7584a5772bd4c
This commit is contained in:
Bartosz Dziewoński 2014-09-05 20:17:40 +02:00 committed by Timo Tijhof
parent d4e85ce129
commit 6ff6ded2fc
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
RELEASE-NOTES-1.24
View file

@ -449,10 +449,11 @@ changes to languages because of Bugzilla reports.
called unconditionally.
* TablePager::getBody() is now 'final' and can't be overridden in subclasses.
* TablePager::getBody() is deprecated, use getBodyOutput() or getFullOutput().
* log_page for move log entries store the original page ID, rather than that
* log_page for move log entries store the original page ID, rather than that
of the new redirect page. This is not retroactive.
* LCStoreAccel was removed. $wgLocalisationCacheConf can no longer be set to
* LCStoreAccel was removed. $wgLocalisationCacheConf can no longer be set to
use this store class.
* Html::infoBox() no longer accepts paths relative to skins/common/images/.
==== Renamed classes ====
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression

11
includes/Html.php
View file

@ -937,20 +937,13 @@ class Html {
* Get HTML for an info box with an icon.
*
* @param string $text Wikitext, get this with wfMessage()->plain()
* @param string $icon Icon name, file in skins/common/images
* @param string $icon Path to icon file (used as 'src' attribute)
* @param string $alt Alternate text for the icon
* @param string $class Additional class name to add to the wrapper div
* @param bool $useStylePath
*
* @return string
*/
static function infoBox( $text, $icon, $alt, $class = false, $useStylePath = true ) {
global $wgStylePath;
if ( $useStylePath ) {
$icon = $wgStylePath . '/common/images/' . $icon;
}
static function infoBox( $text, $icon, $alt, $class = false ) {
$s = Html::openElement( 'div', array( 'class' => "mw-infobox $class" ) );
$s .= Html::openElement( 'div', array( 'class' => 'mw-infobox-left' ) ) .

2
includes/installer/WebInstaller.php
View file

@ -679,7 +679,7 @@ class WebInstaller extends Installer {
'images/' . $icon;
$alt = wfMessage( 'config-information' )->text();
return Html::infoBox( $text, $icon, $alt, $class, false );
return Html::infoBox( $text, $icon, $alt, $class );
}
/**