Commit 470b2e37 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#172262 by JirkaRybka: better globals handling in install system, so the...

#172262 by JirkaRybka: better globals handling in install system, so the choosen profile and language are remembered
parent 4a347be7
......@@ -257,7 +257,7 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
*/
function drupal_unset_globals() {
if (ini_get('register_globals')) {
$allowed = array('_ENV' => 1, '_GET' => 1, '_POST' => 1, '_COOKIE' => 1, '_FILES' => 1, '_SERVER' => 1, '_REQUEST' => 1, 'access_check' => 1, 'GLOBALS' => 1);
$allowed = array('_ENV' => 1, '_GET' => 1, '_POST' => 1, '_COOKIE' => 1, '_FILES' => 1, '_SERVER' => 1, '_REQUEST' => 1, 'GLOBALS' => 1);
foreach ($GLOBALS as $key => $value) {
if (!isset($allowed[$key])) {
unset($GLOBALS[$key]);
......
......@@ -15,10 +15,12 @@
* The installation phase we should proceed to.
*/
function install_main() {
global $profile, $install_locale, $conf;
require_once './includes/bootstrap.inc';
drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
// This must go after drupal_bootstrap(), which unsets globals!
global $profile, $install_locale, $conf;
require_once './modules/system/system.install';
require_once './includes/file.inc';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment