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 "Rename NameTableStore wiki ID field to a DB domain field"
[lhc/web/wiklou.git]
/
mw-config
/
index.php
diff --git
a/mw-config/index.php
b/mw-config/index.php
index
804d0a1
..
b625c96
100644
(file)
--- a/
mw-config/index.php
+++ b/
mw-config/index.php
@@
-38,12
+38,13
@@
require dirname( __DIR__ ) . '/includes/WebStart.php';
wfInstallerMain();
function wfInstallerMain() {
wfInstallerMain();
function wfInstallerMain() {
- global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
+ global $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames;
+ $request = RequestContext::getMain()->getRequest();
- $installer = InstallerOverrides::getWebInstaller( $
wgR
equest );
+ $installer = InstallerOverrides::getWebInstaller( $
r
equest );
if ( !$installer->startSession() ) {
if ( !$installer->startSession() ) {
- if ( $installer->request->getVal(
"css"
) ) {
+ if ( $installer->request->getVal(
'css'
) ) {
// Do not display errors on css pages
$installer->outputCss();
exit;
// Do not display errors on css pages
$installer->outputCss();
exit;
@@
-62,8
+63,8
@@
function wfInstallerMain() {
$session = array();
}
$session = array();
}
- if (
!is_null( $wgRequest->getVal( 'uselang' )
) ) {
- $langCode = $
wgR
equest->getVal( 'uselang' );
+ if (
$request->getCheck( 'uselang'
) ) {
+ $langCode = $
r
equest->getVal( 'uselang' );
} elseif ( isset( $session['settings']['_UserLang'] ) ) {
$langCode = $session['settings']['_UserLang'];
} else {
} elseif ( isset( $session['settings']['_UserLang'] ) ) {
$langCode = $session['settings']['_UserLang'];
} else {