saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248485
Change subject: Don't pollute global namespace with session variables
......................................................................
Don't pollute global namespace with session variables
There is no need to store session variables
(that also include user-supplied arguments)
as $wgXXX global variables.
Bug: T116375
Change-Id: I880d4299566beaf99ed1fc21c690cdda64149b0e
---
M includes/installer/Installer.php
M includes/installer/WebInstaller.php
2 files changed, 2 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/85/248485/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 064bd6d..91589e1 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -692,17 +692,6 @@
}
/**
- * Exports all wg* variables stored by the installer into global scope.
- */
- public function exportVars() {
- foreach ( $this->settings as $name => $value ) {
- if ( substr( $name, 0, 2 ) == 'wg' ) {
- $GLOBALS[$name] = $value;
- }
- }
- }
-
- /**
* Environment check for DB types.
* @return bool
*/
diff --git a/includes/installer/WebInstaller.php
b/includes/installer/WebInstaller.php
index 67a4def..8d7b2ea 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -159,7 +159,6 @@
$this->settings = $session['settings'] +
$this->settings;
}
- $this->exportVars();
$this->setupLanguage();
if ( ( $this->getVar( '_InstallDone' ) || $this->getVar(
'_UpgradeDone' ) )
@@ -277,6 +276,8 @@
$this->disableTimeLimit();
}
+ global $wgMainCacheType;
+ error_log( $pageName . ': $wgMainCacheType = ' .
$wgMainCacheType );
$result = $page->execute();
$this->endPageWrapper();
--
To view, visit https://gerrit.wikimedia.org/r/248485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I880d4299566beaf99ed1fc21c690cdda64149b0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: saper <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
