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

Merge pull request #99 from pantheon-systems/unify-settings

Browse source 
Related to #74: Unify settings.php and default.settings.php.
This commit is contained in:
Greg Anderson 2015-11-04 11:28:07 -08:00
commit 6419a031d7
2 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -693,6 +693,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.
*
@ -703,6 +714,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';
}