aboutsummaryrefslogtreecommitdiffstats
path: root/includes/Html.php
diff options
context:
space:
mode:
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>2019-07-08 23:49:14 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2019-07-08 23:49:14 +0000
commit35252b7aaf421d44e15811095b07d5e0d011864e (patch)
tree8ff132ec39929867f731c7fbfb08e7f974d0eff6 /includes/Html.php
parent3bcd6fdb84d7ce9753ffb97de28e3d9ef48eeb12 (diff)
parent51e00a4f262efb0faf1aac1e547086f9df6eedb8 (diff)
downloadmediawikicore-35252b7aaf421d44e15811095b07d5e0d011864e.tar.gz
mediawikicore-35252b7aaf421d44e15811095b07d5e0d011864e.zip
Merge "installer: Fix Html::infoBox param docs and mark as internal"
Diffstat (limited to 'includes/Html.php')
-rw-r--r--includes/Html.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/Html.php b/includes/Html.php
index 07de58c6da2d..d0f9fc64e9ba 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -1004,16 +1004,16 @@ class Html {
}
/**
- * Get HTML for an info box with an icon.
+ * Get HTML for an information message box with an icon.
*
- * @param string $text Wikitext, get this with wfMessage()->plain()
+ * @internal For use by the WebInstaller class.
+ * @param string $rawHtml HTML
* @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
- *
- * @return string
+ * @return string HTML
*/
- static function infoBox( $text, $icon, $alt, $class = '' ) {
+ public static function infoBox( $rawHtml, $icon, $alt, $class = '' ) {
$s = self::openElement( 'div', [ 'class' => "mw-infobox $class" ] );
$s .= self::openElement( 'div', [ 'class' => 'mw-infobox-left' ] ) .
@@ -1026,7 +1026,7 @@ class Html {
self::closeElement( 'div' );
$s .= self::openElement( 'div', [ 'class' => 'mw-infobox-right' ] ) .
- $text .
+ $rawHtml .
self::closeElement( 'div' );
$s .= self::element( 'div', [ 'style' => 'clear: left;' ], ' ' );