dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Ignore EXIF data in FormatMetadata::fetchExtendedMetadata()"
[lhc/web/wiklou.git]
/
includes
/
installer
/
WebInstallerOutput.php
diff --git
a/includes/installer/WebInstallerOutput.php
b/includes/installer/WebInstallerOutput.php
index
3094d55
..
44ca7d3
100644
(file)
--- a/
includes/installer/WebInstallerOutput.php
+++ b/
includes/installer/WebInstallerOutput.php
@@
-227,7
+227,7
@@
class WebInstallerOutput {
public function getHeadAttribs() {
return array(
'dir' => $this->getDir(),
public function getHeadAttribs() {
return array(
'dir' => $this->getDir(),
- 'lang' =>
$this->getLanguageCode(
),
+ 'lang' =>
wfBCP47( $this->getLanguageCode()
),
);
}
);
}
@@
-296,11
+296,14
@@
class WebInstallerOutput {
href="https://www.mediawiki.org/"
title="Main Page"></a>
</div>
href="https://www.mediawiki.org/"
title="Main Page"></a>
</div>
- <div class="portal"><div class="body">
<?php
<?php
- echo $this->parent->parse( wfMessage( 'config-sidebar' )->plain(), true );
+ $message = wfMessage( 'config-sidebar' )->plain();
+ foreach ( explode( '----', $message ) as $section ) {
+ echo '<div class="portal"><div class="body">';
+ echo $this->parent->parse( $section, true );
+ echo '</div></div>';
+ }
?>
?>
- </div></div>
</div>
<?php
</div>
<?php