Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#154388 (backport of #172262) by JirkaRybka. Better globals handling in install system, so the choosen profile and language are remembered.

5.x
Neil Drumm 2007-11-07 08:10:16 +00:00
parent 5f8bab87e1
commit b6d2e81d5a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install.php
View File

@ -15,9 +15,10 @@ require_once './includes/install.inc';
* The installation phase we should proceed to. * The installation phase we should proceed to.
*/ */
function install_main() { function install_main() {
global $profile, $install_locale;
require_once './includes/bootstrap.inc'; require_once './includes/bootstrap.inc';
drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
// This must go after drupal_bootstrap(), which unsets globals!
global $profile, $install_locale;
require_once './modules/system/system.install'; require_once './modules/system/system.install';
require_once './includes/file.inc'; require_once './includes/file.inc';