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 "Accessor to get EditPage parent revision ID"
[lhc/web/wiklou.git]
/
includes
/
installer
/
DatabaseInstaller.php
diff --git
a/includes/installer/DatabaseInstaller.php
b/includes/installer/DatabaseInstaller.php
index
1c15ad0
..
752450f
100644
(file)
--- a/
includes/installer/DatabaseInstaller.php
+++ b/
includes/installer/DatabaseInstaller.php
@@
-369,12
+369,17
@@
abstract class DatabaseInstaller {
}
/**
}
/**
- * Get a name=>value map of MW configuration globals that overrides.
- * DefaultSettings.php
+ * Get a name=>value map of MW configuration globals for the default values.
* @return array
*/
public function getGlobalDefaults() {
* @return array
*/
public function getGlobalDefaults() {
- return array();
+ $defaults = array();
+ foreach ( $this->getGlobalNames() as $var ) {
+ if ( isset( $GLOBALS[$var] ) ) {
+ $defaults[$var] = $GLOBALS[$var];
+ }
+ }
+ return $defaults;
}
/**
}
/**
@@
-644,10
+649,10
@@
abstract class DatabaseInstaller {
return $status;
}
global $IP;
return $status;
}
global $IP;
-
wfS
uppressWarnings();
+
MediaWiki\s
uppressWarnings();
$rows = file( "$IP/maintenance/interwiki.list",
FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES );
$rows = file( "$IP/maintenance/interwiki.list",
FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES );
-
wfR
estoreWarnings();
+
MediaWiki\r
estoreWarnings();
$interwikis = array();
if ( !$rows ) {
return Status::newFatal( 'config-install-interwiki-list' );
$interwikis = array();
if ( !$rows ) {
return Status::newFatal( 'config-install-interwiki-list' );