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 "Fix Postgres support"
[lhc/web/wiklou.git]
/
includes
/
installer
/
WebInstallerName.php
diff --git
a/includes/installer/WebInstallerName.php
b/includes/installer/WebInstallerName.php
index
2345d89
..
81a107d
100644
(file)
--- a/
includes/installer/WebInstallerName.php
+++ b/
includes/installer/WebInstallerName.php
@@
-50,6
+50,11
@@
class WebInstallerName extends WebInstallerPage {
wfMessage( 'config-ns-other-default' )->inContentLanguage()->text()
);
wfMessage( 'config-ns-other-default' )->inContentLanguage()->text()
);
+ $pingbackInfo = ( new Pingback() )->getSystemInfo();
+ // Database isn't available in config yet, so take it
+ // from the installer
+ $pingbackInfo['database'] = $this->getVar( 'wgDBtype' );
+
$this->addHTML(
$this->parent->getTextBox( [
'var' => 'wgSitename',
$this->addHTML(
$this->parent->getTextBox( [
'var' => 'wgSitename',
@@
-103,7
+108,10
@@
class WebInstallerName extends WebInstallerPage {
$this->parent->getCheckBox( [
'var' => 'wgPingback',
'label' => 'config-pingback',
$this->parent->getCheckBox( [
'var' => 'wgPingback',
'label' => 'config-pingback',
- 'help' => $this->parent->getHelpBox( 'config-pingback-help' ),
+ 'help' => $this->parent->getHelpBox(
+ 'config-pingback-help',
+ FormatJson::encode( $pingbackInfo, true )
+ ),
'value' => true,
] ) .
$this->getFieldsetEnd() .
'value' => true,
] ) .
$this->getFieldsetEnd() .
@@
-243,7
+251,7
@@
class WebInstallerName extends WebInstallerPage {
$retVal = false;
}
// If they asked to subscribe to mediawiki-announce but didn't give
$retVal = false;
}
// If they asked to subscribe to mediawiki-announce but didn't give
- // an e-mail, show an error.
Bug 29
332
+ // an e-mail, show an error.
T31
332
if ( !$email && $this->getVar( '_Subscribe' ) ) {
$this->parent->showError( 'config-subscribe-noemail' );
$retVal = false;
if ( !$email && $this->getVar( '_Subscribe' ) ) {
$this->parent->showError( 'config-subscribe-noemail' );
$retVal = false;