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

Issue #1118520 by sun, Dave Reid, mr.baileys: Added inclusion of a settings.local.php file in settings.php.

8.0.x
catch 2012-05-29 14:05:39 +09:00
parent 0a3599141e
commit 9ba8724f3a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/includes/bootstrap.inc
View File

@ -668,8 +668,10 @@ function drupal_settings_initialize() {
global $databases, $cookie_domain, $conf, $installed_profile, $update_free_access, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directory_name; global $databases, $cookie_domain, $conf, $installed_profile, $update_free_access, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directory_name;
$conf = array(); $conf = array();
if (file_exists(DRUPAL_ROOT . '/' . conf_path() . '/settings.php')) { // Make conf_path() available as local variable in settings.php.
include_once DRUPAL_ROOT . '/' . conf_path() . '/settings.php'; $conf_path = conf_path();
if (file_exists(DRUPAL_ROOT . '/' . $conf_path . '/settings.php')) {
include_once DRUPAL_ROOT . '/' . $conf_path . '/settings.php';
} }
$is_https = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on'; $is_https = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';

14
sites/default/default.settings.php
View File

@ -528,3 +528,17 @@ $conf['404_fast_html'] = '<!DOCTYPE html><head><title>404 Not Found</title></hea
* Remove the leading hash signs to disable. * Remove the leading hash signs to disable.
*/ */
# $conf['allow_authorize_operations'] = FALSE; # $conf['allow_authorize_operations'] = FALSE;
/**
* 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 e-mails, 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 (file_exists(DRUPAL_ROOT . '/' . $conf_path . '/settings.local.php')) {
# include DRUPAL_ROOT . '/' . $conf_path . '/settings.local.php';
# }