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 "MCR: replace slot_inherited with slot_origin"
[lhc/web/wiklou.git]
/
includes
/
installer
/
WebInstallerInstall.php
diff --git
a/includes/installer/WebInstallerInstall.php
b/includes/installer/WebInstallerInstall.php
index
51a58ae
..
63740e3
100644
(file)
--- a/
includes/installer/WebInstallerInstall.php
+++ b/
includes/installer/WebInstallerInstall.php
@@
-40,8
+40,8
@@
class WebInstallerInstall extends WebInstallerPage {
$this->startForm();
$this->addHTML( "<ul>" );
$results = $this->parent->performInstallation(
$this->startForm();
$this->addHTML( "<ul>" );
$results = $this->parent->performInstallation(
-
array( $this, 'startStage' )
,
- array( $this, 'endStage' )
+
[ $this, 'startStage' ]
,
+ [ $this, 'endStage' ]
);
$this->addHTML( "</ul>" );
// PerformInstallation bails on a fatal, so make sure the last item
);
$this->addHTML( "</ul>" );
// PerformInstallation bails on a fatal, so make sure the last item
@@
-81,9
+81,9
@@
class WebInstallerInstall extends WebInstallerPage {
if ( $step == 'extension-tables' ) {
$this->endLiveBox();
}
if ( $step == 'extension-tables' ) {
$this->endLiveBox();
}
- $msg = $status->isO
k
() ? 'config-install-step-done' : 'config-install-step-failed';
+ $msg = $status->isO
K
() ? 'config-install-step-done' : 'config-install-step-failed';
$html = wfMessage( 'word-separator' )->escaped() . wfMessage( $msg )->escaped();
$html = wfMessage( 'word-separator' )->escaped() . wfMessage( $msg )->escaped();
- if ( !$status->isO
k
() ) {
+ if ( !$status->isO
K
() ) {
$html = "<span class=\"error\">$html</span>";
}
$this->addHTML( $html . "</li>\n" );
$html = "<span class=\"error\">$html</span>";
}
$this->addHTML( $html . "</li>\n" );