opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0.0. For more information, see https://www.drupal.org/node/2619030

Browse source
This commit is contained in:
Pantheon Automation 2015-11-19 07:04:44 -08:00 • committed by Greg Anderson
parent 7784f4c23d
commit 25a6735fb3
49 changed files with 1394 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sites/default/default.settings.php
View file

@ -699,6 +699,17 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
* example.org, with all subdomains included.
*/
/**
* Include the Pantheon-specific settings file.
*
* n.b. The settings.pantheon.php file makes some changes
* that affect all envrionments that this site
* exists in. Always include this file, even in
* a local development environment, to insure that
* the site settings remain consistent.
*/
include __DIR__ . "/settings.pantheon.php";
/**
* Load local development override configuration, if available.
*
@ -709,6 +720,6 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
*
* Keep this code block at the end of this file to take full effect.
*/
# if (file_exists(__DIR__ . '/settings.local.php')) {
# include __DIR__ . '/settings.local.php';
# }
if (file_exists(__DIR__ . '/settings.local.php')) {
include __DIR__ . '/settings.local.php';
}

16
sites/default/settings.pantheon.php
View file

@ -47,20 +47,6 @@ else {
);
}
/**
* Override the $install_state variable to let Drupal know that the settings are verified
* since they are being passed directly by the Pantheon.
*
* Issue: https://github.com/pantheon-systems/drops-8/issues/9
*
*/
if (
isset($_ENV['PANTHEON_ENVIRONMENT']) &&
$is_installer_url &&
(php_sapi_name() != "cli")
) {
$GLOBALS['install_state']['settings_verified'] = TRUE;
}
/**
* Allow Drupal 8 to Cleanly Redirect to Install.php For New Sites.
@ -73,7 +59,7 @@ if (
if (
isset($_ENV['PANTHEON_ENVIRONMENT']) &&
!$is_installer_url &&
(!is_dir(__DIR__ . '/files/styles')) &&
(isset($_SERVER['PANTHEON_DATABASE_STATE']) && ($_SERVER['PANTHEON_DATABASE_STATE'] == 'empty')) &&
(empty($GLOBALS['install_state'])) &&
(php_sapi_name() != "cli")
) {