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

Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.

Browse source
This commit is contained in:
Pantheon Automation 2015-11-17 13:42:33 -08:00 • committed by Greg Anderson
parent 4afb23bbd3
commit 7784f4c23d
929 changed files with 19798 additions and 5304 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sites/default/settings.php
View file

@ -1,20 +1,5 @@
<?php
/**
* @file
* Drupal site-specific configuration file.
*
* This is the standard settings file provided by default
* for Drupal sites running on the Pantheon platform.
* This file will not be changed in updated versions, so
* you may place your customizations here without causing
* merge conflicts during upgrades.
*
* See default.settings.php for more configuration options.
* You may copy the default.settings.php file over this
* file if you wish.
*/
/**
* Load services definition file.
*/
@ -32,15 +17,9 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
include __DIR__ . "/settings.pantheon.php";
/**
* Load local development override configuration, if available.
*
* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. Typically used to disable
* caching, JavaScript/CSS compression, re-routing of outgoing emails, and
* other things that should not happen on development and testing sites.
*
* Keep this code block at the end of this file to take full effect.
* If there is a local settings file, then include it
*/
if (file_exists(__DIR__ . '/settings.local.php')) {
include __DIR__ . '/settings.local.php';
$local_settings = __DIR__ . "/settings.local.php";
if (file_exists($local_settings)) {
include $local_settings;
}